Automerge.

This commit is contained in:
Davi Arnaut 2009-11-03 16:18:44 -02:00
commit cca9eeb622

View File

@ -1631,12 +1631,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;
} }