diff options
| author | kostja@bodhi.local <> | 2006-08-12 21:06:51 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-08-12 21:06:51 +0400 |
| commit | 04c97488f91c3db48be384c2ed14082dc6d6616b (patch) | |
| tree | cccb1fdd583e353f4a229cbb0f9d585104db78f9 /client/mysqlimport.c | |
| parent | b341356abdfa869c71d42709a13c2192603fab1c (diff) | |
| parent | 6691c623100134d666b142f5752fcc022bdd1ac9 (diff) | |
| download | mariadb-git-04c97488f91c3db48be384c2ed14082dc6d6616b.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 18a31117c08..2ef08c9a504 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -538,7 +538,7 @@ pthread_handler_t worker_thread(void *arg) goto error; } - if (mysql_query(mysql, "set @@character_set_database=binary;")) + if (mysql_query(mysql, "/*!40101 set @@character_set_database=binary */;")) { db_error(mysql); /* We shall countinue here, if --force was given */ goto error; @@ -644,7 +644,7 @@ int main(int argc, char **argv) return(1); /* purecov: deadcode */ } - if (mysql_query(mysql, "set @@character_set_database=binary;")) + if (mysql_query(mysql, "/*!40101 set @@character_set_database=binary */;")) { db_error(mysql); /* We shall countinue here, if --force was given */ return(1); |