summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-11-10 13:08:22 +0200
committerunknown <monty@mysql.com>2004-11-10 13:08:22 +0200
commit977fef311eb67fa6f7ec81f38f3b3190eb3e1ed5 (patch)
treeeff115758b0cd93a50886b331531d19b47c69c33 /include
parent67ce88fc48aa95d88be59c81f2d8443c5354d63f (diff)
parent81880bab136d5df8cfdc47a953cff1442adb11f6 (diff)
downloadmariadb-git-977fef311eb67fa6f7ec81f38f3b3190eb3e1ed5.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'include')
-rw-r--r--include/mysql.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h
index 156d749234b..2c0197e2300 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);