Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new
This commit is contained in:
commit
f8a178000d
@ -2836,6 +2836,9 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
|
|||||||
{
|
{
|
||||||
char buff[MY_CS_NAME_SIZE + 10];
|
char buff[MY_CS_NAME_SIZE + 10];
|
||||||
charsets_dir= save_csdir;
|
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);
|
sprintf(buff, "SET NAMES %s", cs_name);
|
||||||
if (!mysql_real_query(mysql, buff, strlen(buff)))
|
if (!mysql_real_query(mysql, buff, strlen(buff)))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user