diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-07-20 17:30:44 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-07-20 17:30:44 +0200 |
| commit | 61ee0955717fd26f6da27d4996814d10f58192fe (patch) | |
| tree | 108921415d792dd6141a32a761421189c00bbd6f /client/mysqlimport.c | |
| parent | 22a963080bae524a39e16f30f40a5e33934d9329 (diff) | |
| download | mariadb-git-61ee0955717fd26f6da27d4996814d10f58192fe.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
client/mysqlimport.c:
Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 2 |
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); |