diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-24 19:25:23 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-24 19:25:23 -0200 |
| commit | ec3e44778d3b5805fe7323f0df35ee5a3cee23b7 (patch) | |
| tree | de192332ac9c771c0738e3a88ce93e6af3b52183 /include | |
| parent | 7d00a27fc2bb196a8cb91e9e2395856cb175194f (diff) | |
| download | mariadb-git-ec3e44778d3b5805fe7323f0df35ee5a3cee23b7.tar.gz | |
Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 and up.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 10 | ||||
| -rw-r--r-- | include/mysql.h.pp | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/include/mysql.h b/include/mysql.h index 68cce3196a0..d114afb6c93 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -557,16 +557,6 @@ unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, unsigned long length); void STDCALL mysql_debug(const char *debug); -char * STDCALL mysql_odbc_escape_string(MYSQL *mysql, - char *to, - unsigned long to_length, - const char *from, - unsigned long from_length, - void *param, - char * - (*extend_buffer) - (void *, char *to, - unsigned long *length)); void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name); unsigned int STDCALL mysql_thread_safe(void); my_bool STDCALL mysql_embedded(void); diff --git a/include/mysql.h.pp b/include/mysql.h.pp index bd4c79916dd..633cde41130 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -518,16 +518,6 @@ unsigned long mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, unsigned long length); void mysql_debug(const char *debug); -char * mysql_odbc_escape_string(MYSQL *mysql, - char *to, - unsigned long to_length, - const char *from, - unsigned long from_length, - void *param, - char * - (*extend_buffer) - (void *, char *to, - unsigned long *length)); void myodbc_remove_escape(MYSQL *mysql,char *name); unsigned int mysql_thread_safe(void); my_bool mysql_embedded(void); |