diff options
| author | bar@bar.mysql.r18.ru <> | 2003-04-22 12:27:35 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-04-22 12:27:35 +0500 |
| commit | a3d08eaaf97c013569516294ae97b8118b3db0b0 (patch) | |
| tree | 6dd5c8b39f4559e24fd1326165b8aa41ff52e71d /sql/mysqld.cc | |
| parent | 292f7954bd636b34245a79f4054f4a6d6140f544 (diff) | |
| download | mariadb-git-a3d08eaaf97c013569516294ae97b8118b3db0b0.tar.gz | |
I renamed system variable literal_collation into connection_collation
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 47c9c3f8331..f04ca371c60 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2094,7 +2094,7 @@ static int init_common_variables(const char *conf_file_name, int argc, return 1; global_system_variables.result_collation= default_charset_info; global_system_variables.client_collation= default_charset_info; - global_system_variables.literal_collation= default_charset_info; + global_system_variables.connection_collation= default_charset_info; charsets_list= list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG)); @@ -4577,7 +4577,7 @@ static void set_options(void) /* Set default values for some variables */ global_system_variables.result_collation= default_charset_info; global_system_variables.client_collation= default_charset_info; - global_system_variables.literal_collation= default_charset_info; + global_system_variables.connection_collation= default_charset_info; global_system_variables.table_type= DB_TYPE_MYISAM; global_system_variables.tx_isolation= ISO_REPEATABLE_READ; global_system_variables.select_limit= (ulonglong) HA_POS_ERROR; |