Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug15690

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug15690
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
9aa18a4b · msvensson@neptunus.(none) · 119c5f26 · dbb5a408 · 9aa18a4b
Commit 9aa18a4b authored Jul 24, 2006 by msvensson@neptunus.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

client/mysqlimport.c client/mysqlimport.c +1 -1

No files found.
--- 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);