summaryrefslogtreecommitdiff
path: root/client/mysqlimport.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-12-28 03:56:38 +0200
committermonty@donna.mysql.com <>2000-12-28 03:56:38 +0200
commitc0f40d14cc36f56f5b4dba288583acd345429e4e (patch)
treec27e400395741740f2e230395445236b38db27c1 /client/mysqlimport.c
parent361067e9150f7fa57d5b2ac722ed55df9c14cc53 (diff)
downloadmariadb-git-c0f40d14cc36f56f5b4dba288583acd345429e4e.tar.gz
Added support for hex strings to mysqlimport
A lot of new tests to mysqltest Fixed bug with BDB tables and autocommit
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r--client/mysqlimport.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index d00c99d4061..f85a1c128e2 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -456,9 +456,14 @@ static char *add_load_option(char *ptr,const char *object,const char *statement)
{
if (object)
{
- ptr= strxmov(ptr," ",statement," '",NullS);
- ptr= field_escape(ptr,object,(uint) strlen(object));
- *ptr++= '\'';
+ if (!strncasecmp(object,"0x",2)) /* hex constant; don't escape */
+ ptr= strxmov(ptr," ",statement," ",object,NullS);
+ else /* char constant; escape */
+ {
+ ptr= strxmov(ptr," ",statement," '",NullS);
+ ptr= field_escape(ptr,object,(uint) strlen(object));
+ *ptr++= '\'';
+ }
}
return ptr;
}