1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto-merge from mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-11-06 19:15:09 +03:00
commit e89a561d52
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmysql/libmysql.c
View File

@ -1260,12 +1260,14 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,
char * STDCALL char * STDCALL
mysql_odbc_escape_string(MYSQL *mysql, mysql_odbc_escape_string(MYSQL *mysql __attribute__((unused)),
char *to, ulong to_length, char *to __attribute__((unused)),
const char *from, ulong from_length, ulong to_length __attribute__((unused)),
void *param, const char *from __attribute__((unused)),
char * (*extend_buffer) ulong from_length __attribute__((unused)),
(void *, char *, ulong *)) void *param __attribute__((unused)),
char * (*extend_buffer)(void *, char *, ulong *)
__attribute__((unused)))
{ {
return NULL; return NULL;
} }

2
mysql-test/t/disabled.def
View File

@ -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 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_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 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