Commit c2af753f authored by unknown's avatar unknown

Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl

into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


mysql-test/t/ctype_uca.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/subselect.test:
  After merge fix
parents 06b425a5 c359f7ff
...@@ -2923,7 +2923,6 @@ static int init_common_variables(const char *conf_file_name, int argc, ...@@ -2923,7 +2923,6 @@ static int init_common_variables(const char *conf_file_name, int argc,
global_system_variables.collation_connection= default_charset_info; global_system_variables.collation_connection= default_charset_info;
global_system_variables.character_set_results= default_charset_info; global_system_variables.character_set_results= default_charset_info;
global_system_variables.character_set_client= default_charset_info; global_system_variables.character_set_client= default_charset_info;
global_system_variables.collation_connection= default_charset_info;
if (!(character_set_filesystem= if (!(character_set_filesystem=
get_charset_by_csname(character_set_filesystem_name, get_charset_by_csname(character_set_filesystem_name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment