Commit c86853e0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged
parents ee75eaa3 f53c12c8

sql-common/client.c

+3 −0
Original line number Diff line number Diff line
@@ -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)))

    {