diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 12:20:54 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 12:20:54 +0200 |
| commit | 60108e80be8c4ac18c3664c8a19531c4ca0fd62c (patch) | |
| tree | aad2fa526177cc912f14961c9e775a1f8c0a90ef /client | |
| parent | d8fa981918d0a98fb83db4733542a61312fbff6c (diff) | |
| parent | 5f6b100ed0eaacd644352972939a77f0a964c1af (diff) | |
| download | mariadb-git-60108e80be8c4ac18c3664c8a19531c4ca0fd62c.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlimport.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index ca0a751e963..19d4ef16ef9 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -518,6 +518,13 @@ int main(int argc, char **argv) free_defaults(argv_to_free); return(1); /* purecov: deadcode */ } + + if (mysql_query(sock, "set @@character_set_database=binary;")) + { + db_error(sock); /* We shall countinue here, if --force was given */ + return(1); + } + if (lock_tables) lock_table(sock, argc, argv); for (; *argv != NULL; argv++) |