From 45a3bb57d6b637142c83cbcafe754d37407c0397 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Thu, 6 Apr 2006 11:47:46 +0500
Subject: [PATCH 1/2] libmysql.c:   Bug#18830: incompatibility new libraries
 with old server   Don't execute SET NAMES with pre-4.1 server.

---
 libmysql/libmysql.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 898e0ad3273..4b8f1c9da1f 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1530,6 +1530,9 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
   {
     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_query(mysql, buff))
     {

From 14846536a45291715084b1c5361c77c38f6c83dd Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Thu, 6 Apr 2006 12:43:13 +0500
Subject: [PATCH 2/2] 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sql-common/client.c b/sql-common/client.c
index cd50960164b..e7e74795fa0 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2836,6 +2836,9 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
   {
     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)))
     {