diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 14:03:16 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 14:03:16 +0300 |
| commit | e1a2211ad940cba4affcface70e51c5792894997 (patch) | |
| tree | f9052637897a910b3a182d1eb1a52f71e48806bf /include | |
| parent | 99d2c97208b2b34a920bd2608eb12ec296046e35 (diff) | |
| parent | b51777484f53b30bf49e921cbc74d39916d530cb (diff) | |
| download | mariadb-git-e1a2211ad940cba4affcface70e51c5792894997.tar.gz | |
Auto-merge from mysql-5.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 10 | ||||
| -rw-r--r-- | include/mysql.h.pp | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index d114afb6c93..68cce3196a0 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -557,6 +557,16 @@ 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 633cde41130..bd4c79916dd 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -518,6 +518,16 @@ 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); |