summaryrefslogtreecommitdiff
path: root/client/mysqlimport.c
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-07-20 17:30:44 +0200
committermsvensson@neptunus.(none) <>2006-07-20 17:30:44 +0200
commitdbb5a408eaf1741823910fb73862a12b58502480 (patch)
tree108921415d792dd6141a32a761421189c00bbd6f /client/mysqlimport.c
parentcb23cd759e97bacd1adf7577425575808b7b852c (diff)
downloadmariadb-git-dbb5a408eaf1741823910fb73862a12b58502480.tar.gz
Bug#15690 mysqlimport tries to set options the server doesn't understand
- "set @@character_set_database" should be ignored by servers prior to 4.1.1
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r--client/mysqlimport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 1f9b96f91be..67659684c9c 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -521,7 +521,7 @@ int main(int argc, char **argv)
return(1); /* purecov: deadcode */
}
- if (mysql_query(sock, "set @@character_set_database=binary;"))
+ if (mysql_query(sock, "/*!40101 set @@character_set_database=binary */;"))
{
db_error(sock); /* We shall countinue here, if --force was given */
return(1);