Commit cca9eeb6 authored by Davi Arnaut's avatar Davi Arnaut

Automerge.

parents cb0cca86 69859d8d
...@@ -1631,12 +1631,14 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment