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

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

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