List:Commits« Previous MessageNext Message »
From:bar Date:April 6 2006 7:43am
Subject:bk commit into 5.0 tree (bar:1.2144) BUG#18830
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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
  1.2144 06/04/06 12:43:13 bar@stripped +1 -0
  client.c:
    Bug#18830 incompatibility new libraries with old server
    Additional 5.0 fix:
    applying the same patch to client.c.

  sql-common/client.c
    1.87 06/04/06 12:42:07 bar@stripped +3 -0
    Bug#18830 incompatibility new libraries with old server
    Additional 5.0 fix:
    applying the same patch to client.c.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0

--- 1.86/sql-common/client.c	2006-03-27 14:02:20 +05:00
+++ 1.87/sql-common/client.c	2006-04-06 12:42:07 +05:00
@@ -2836,6 +2836,9 @@ int STDCALL mysql_set_character_set(MYSQ
   {
     char buff[MY_CS_NAME_SIZE + 10];
     charsets_dir= save_csdir;
+    /* Skip execution of "SET NAMES" for pre-4.1 servers */
+    if (mysql_get_server_version(mysql) < 40100)
+      return 0;
     sprintf(buff, "SET NAMES %s", cs_name);
     if (!mysql_real_query(mysql, buff, strlen(buff)))
     {
Thread
bk commit into 5.0 tree (bar:1.2144) BUG#18830bar6 Apr