Commit 0b399f1d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1.b7192 

into  mysql.com:/usr/home/bar/mysql-5.0-kt


sql-common/client.c:
  Auto merged
parents 4d71b8f8 eebe37d0

sql-common/client.c

+31 −2
Original line number Diff line number Diff line
@@ -1673,11 +1673,18 @@ C_MODE_START 
int mysql_init_character_set(MYSQL *mysql)

{

  NET		*net= &mysql->net;

  const char *default_collation_name;

  

  /* Set character set */

  if (!mysql->options.charset_name &&

      !(mysql->options.charset_name= 

  if (!mysql->options.charset_name)

  {

    default_collation_name= MYSQL_DEFAULT_COLLATION_NAME;

    if (!(mysql->options.charset_name= 

       my_strdup(MYSQL_DEFAULT_CHARSET_NAME,MYF(MY_WME))))

    return 1;

  }

  else

    default_collation_name= NULL;

  

  {

    const char *save= charsets_dir;
@@ -1685,6 +1692,28 @@ int mysql_init_character_set(MYSQL *mysql) 
      charsets_dir=mysql->options.charset_dir;

    mysql->charset=get_charset_by_csname(mysql->options.charset_name,

                                         MY_CS_PRIMARY, MYF(MY_WME));

    if (mysql->charset && default_collation_name)

    {

      CHARSET_INFO *collation;

      if ((collation= 

           get_charset_by_name(default_collation_name, MYF(MY_WME))))

      {

        if (!my_charset_same(mysql->charset, collation))

        {

          my_printf_error(ER_UNKNOWN_ERROR, 

                         "COLLATION %s is not valid for CHARACTER SET %s",

                         MYF(0),

                         default_collation_name, mysql->options.charset_name);

          mysql->charset= NULL;

        }

        else

        {

          mysql->charset= collation;

        }

      }

      else

        mysql->charset= NULL;

    }

    charsets_dir= save;

  }