diff options
| author | brian@avenger.(none) <> | 2004-11-11 18:58:57 -0800 |
|---|---|---|
| committer | brian@avenger.(none) <> | 2004-11-11 18:58:57 -0800 |
| commit | f05daf02ba845b820d6a817c9e2058654b4a764b (patch) | |
| tree | 46fde821aa292e663e9f48d37f44657e025a1271 /include/mysql.h | |
| parent | 7073829fbb3515edca83a87dbfd428c88f47a3e0 (diff) | |
| parent | 6f39bf2b9c31f78ef6940dacb81e80d6772640b9 (diff) | |
| download | mariadb-git-f05daf02ba845b820d6a817c9e2058654b4a764b.tar.gz | |
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 0a7ab09c57b..0edd3873192 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -490,6 +490,8 @@ MYSQL_RES * STDCALL mysql_list_fields(MYSQL *mysql, const char *table, const char *wild); unsigned long STDCALL mysql_escape_string(char *to,const char *from, unsigned long from_length); +unsigned long STDCALL mysql_hex_string(char *to,const char *from, + unsigned long from_length); unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, unsigned long length); |