MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:July 20 2006 3:30pm
Subject:bk commit into 5.0 tree (msvensson:1.2232) BUG#15690
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-20 17:30:44+02:00, msvensson@neptunus.(none) +1 -0
  Bug#15690 mysqlimport tries to set options the server doesn't understand
   - "set @@character_set_database" should be ignored by servers prior to 4.1.1

  client/mysqlimport.c@stripped, 2006-07-20 17:30:42+02:00, msvensson@neptunus.(none) +1 -1
    Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my50-m-bug15690

--- 1.59/client/mysqlimport.c	2006-07-20 17:30:50 +02:00
+++ 1.60/client/mysqlimport.c	2006-07-20 17:30:50 +02:00
@@ -521,7 +521,7 @@
     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);
Thread
bk commit into 5.0 tree (msvensson:1.2232) BUG#15690msvensson20 Jul