Commit 61ee0955 authored by unknown's avatar unknown

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


client/mysqlimport.c:
  Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1
parent 22a96308
...@@ -521,7 +521,7 @@ int main(int argc, char **argv) ...@@ -521,7 +521,7 @@ int main(int argc, char **argv)
return(1); /* purecov: deadcode */ 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 */ db_error(sock); /* We shall countinue here, if --force was given */
return(1); return(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment