diff -Nru postgresql-mysql-fdw-2.5.0/debian/changelog postgresql-mysql-fdw-2.5.1/debian/changelog --- postgresql-mysql-fdw-2.5.0/debian/changelog 2018-10-19 20:39:10.000000000 +0000 +++ postgresql-mysql-fdw-2.5.1/debian/changelog 2018-11-29 09:30:16.000000000 +0000 @@ -1,3 +1,9 @@ +postgresql-mysql-fdw (2.5.1-1) unstable; urgency=medium + + * New upstream version. + + -- Christoph Berg Thu, 29 Nov 2018 10:30:16 +0100 + postgresql-mysql-fdw (2.5.0-1) unstable; urgency=medium * New upstream version. diff -Nru postgresql-mysql-fdw-2.5.0/debian/source/lintian-overrides postgresql-mysql-fdw-2.5.1/debian/source/lintian-overrides --- postgresql-mysql-fdw-2.5.0/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ postgresql-mysql-fdw-2.5.1/debian/source/lintian-overrides 2018-11-29 09:30:16.000000000 +0000 @@ -0,0 +1,3 @@ +# don't bug people uploading from @work +source: changelog-should-mention-nmu +source: source-nmu-has-incorrect-version-number diff -Nru postgresql-mysql-fdw-2.5.0/expected/mysql_fdw.out postgresql-mysql-fdw-2.5.1/expected/mysql_fdw.out --- postgresql-mysql-fdw-2.5.0/expected/mysql_fdw.out 2018-10-17 15:54:43.000000000 +0000 +++ postgresql-mysql-fdw-2.5.1/expected/mysql_fdw.out 2018-11-23 16:34:09.000000000 +0000 @@ -353,11 +353,21 @@ (1 row) +create or replace function test_param_where2(integer, text) returns integer as ' + select a from numbers where a=$1 and b=$2; +' LANGUAGE sql; +SELECT test_param_where2(1, 'One'); + test_param_where2 +------------------- + 1 +(1 row) + DELETE FROM employee; DELETE FROM department; DELETE FROM empdata; DELETE FROM numbers; DROP FUNCTION test_param_where(); +DROP FUNCTION test_param_where2(integer, text); DROP FOREIGN TABLE numbers; DROP FOREIGN TABLE department; DROP FOREIGN TABLE employee; diff -Nru postgresql-mysql-fdw-2.5.0/mysql_fdw.c postgresql-mysql-fdw-2.5.1/mysql_fdw.c --- postgresql-mysql-fdw-2.5.0/mysql_fdw.c 2018-10-17 15:54:43.000000000 +0000 +++ postgresql-mysql-fdw-2.5.1/mysql_fdw.c 2018-11-23 16:34:09.000000000 +0000 @@ -82,9 +82,9 @@ /* * In PG 9.5.1 the number will be 90501, - * our version is 2.5.0 so number will be 20500 + * our version is 2.5.1 so number will be 20501 */ -#define CODE_VERSION 20500 +#define CODE_VERSION 20501 PG_MODULE_MAGIC; @@ -2118,7 +2118,7 @@ Oid typefnoid; bool isvarlena; - *param_types[i] = exprType(param_expr); + (*param_types)[i] = exprType(param_expr); getTypeOutputInfo(exprType(param_expr), &typefnoid, &isvarlena); fmgr_info(typefnoid, &(*param_flinfo)[i]); diff -Nru postgresql-mysql-fdw-2.5.0/sql/mysql_fdw.sql postgresql-mysql-fdw-2.5.1/sql/mysql_fdw.sql --- postgresql-mysql-fdw-2.5.0/sql/mysql_fdw.sql 2018-10-17 15:54:43.000000000 +0000 +++ postgresql-mysql-fdw-2.5.1/sql/mysql_fdw.sql 2018-11-23 16:34:09.000000000 +0000 @@ -76,12 +76,19 @@ SELECT test_param_where(); +create or replace function test_param_where2(integer, text) returns integer as ' + select a from numbers where a=$1 and b=$2; +' LANGUAGE sql; + +SELECT test_param_where2(1, 'One'); + DELETE FROM employee; DELETE FROM department; DELETE FROM empdata; DELETE FROM numbers; DROP FUNCTION test_param_where(); +DROP FUNCTION test_param_where2(integer, text); DROP FOREIGN TABLE numbers; DROP FOREIGN TABLE department;