diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 7cd11f45beeb162db84dea423a040a296ac2856e (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /include/mysql.h.pp | |
| parent | 5462a6dbcc68d51a89356255fb4f398be7d62c27 (diff) | |
| parent | 3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff) | |
| download | mariadb-git-7cd11f45beeb162db84dea423a040a296ac2856e.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 0ea1d0974c2..78f026215b9 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -474,6 +474,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); |