diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 19:15:09 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 19:15:09 +0300 |
| commit | 966e0d9df48855eb68bd204aec8ca89c8a86d149 (patch) | |
| tree | 09125f6dd29845d9c8b1173575d1216187a82da0 | |
| parent | 6b1d61ecb072aab0f04a4dbaa380309a92ee2b10 (diff) | |
| parent | e0c62aad364ca5f4949206937980016a11eca4f4 (diff) | |
| download | mariadb-git-966e0d9df48855eb68bd204aec8ca89c8a86d149.tar.gz | |
Auto-merge from mysql-trunk-merge.
| -rw-r--r-- | libmysql/libmysql.c | 14 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d5fbbc192f2..adcb65b8c5d 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1260,12 +1260,14 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, char * STDCALL -mysql_odbc_escape_string(MYSQL *mysql, - char *to, ulong to_length, - const char *from, ulong from_length, - void *param, - char * (*extend_buffer) - (void *, char *, ulong *)) +mysql_odbc_escape_string(MYSQL *mysql __attribute__((unused)), + char *to __attribute__((unused)), + ulong to_length __attribute__((unused)), + const char *from __attribute__((unused)), + ulong from_length __attribute__((unused)), + void *param __attribute__((unused)), + char * (*extend_buffer)(void *, char *, ulong *) + __attribute__((unused))) { return NULL; } diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index bf5a31d7b21..ad7617b9403 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -13,3 +13,5 @@ kill : Bug#37780 2008-12-03 HHunger need some changes to be query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes partition_innodb_plugin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes +innodb-autoinc : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference +rpl_killed_ddl : Bug#45520: rpl_killed_ddl fails sporadically in pb2 |