diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-10-24 10:49:46 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-10-24 10:49:46 +0500 |
| commit | 9be2220bfdc9fe67eef558f9bff764e912df7a9b (patch) | |
| tree | f6aa35c19f9376a046bae6703dc4a975d52b4263 /sql/mysqld.cc | |
| parent | fb9a562b1cc2b9048eff094bb7004fb3db0e7fd0 (diff) | |
| parent | e8b8b0894e547bd39c651ef497b52ebd1dd1bedf (diff) | |
| download | mariadb-git-9be2220bfdc9fe67eef558f9bff764e912df7a9b.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
client/mysql.cc:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c128aeaa47d..f336e769c7d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2862,7 +2862,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, |