diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-11-14 11:19:34 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-11-14 11:19:34 +0100 |
| commit | f5613086480b6b3a5d8a673376f461b753269418 (patch) | |
| tree | 1147223a1b6f6925885982f6ee7343a52570be51 /sql/mysqld.cc | |
| parent | 441b86087a448de15a8014d575231886d8b996ce (diff) | |
| parent | b3c4bc6e7dbc1811a2cf11dae822dc9166d9b36b (diff) | |
| download | mariadb-git-f5613086480b6b3a5d8a673376f461b753269418.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
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, |