summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql-common/client.c3
1 files changed, 3 insertions, 0 deletions
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)))
{