Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


client/mysqlimport.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merged from 4.1.
mysql-test/r/mysqldump.result:
  Merged from 4.1.
mysql-test/t/gis.test:
  Merged from 4.1.

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++)