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

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

Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
b96cc51f · bar@bar.myoffice.izhnet.ru · d214425f · 5e14f4f0 · b96cc51f
Commit b96cc51f authored Oct 02, 2007 by bar@bar.myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sql/mysqld.cc sql/mysqld.cc +0 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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.character_set_results= default_charset_info;
  global_system_variables.character_set_client= default_charset_info;
-  global_system_variables.collation_connection= default_charset_info;

  if (!(character_set_filesystem= 
        get_charset_by_csname(character_set_filesystem_name,