diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 10:56:32 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 10:56:32 -0400 |
| commit | c27fea83879241814f4a4ec6099f5189dff3292b (patch) | |
| tree | 9e506785503b3139b60ea559b3852690793471d0 /sql | |
| parent | e45deb96a66b2e94d271de53c33d465b69d73003 (diff) | |
| parent | edc8900bb0d9ea128e38b85d0a936d24fa560ca7 (diff) | |
| download | mariadb-git-c27fea83879241814f4a4ec6099f5189dff3292b.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
mysql-test/r/ctype_ucs2_def.result:
Auto merged
mysql-test/t/ctype_ucs2_def-master.opt:
Auto merged
mysql-test/t/ctype_ucs2_def.test:
Auto merged
sql/mysqld.cc:
Manual merge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c3cc6679a44..30b6bb94ae3 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -508,6 +508,10 @@ key_map key_map_full(0); // Will be initialized later const char *opt_date_time_formats[3]; +char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME; +char *language_ptr, *default_collation_name, *default_character_set_name; +char mysql_data_home_buff[2], *mysql_data_home=mysql_real_data_home; +struct passwd *user_info; char *mysql_data_home= mysql_real_data_home; char server_version[SERVER_VERSION_LENGTH]; char *mysqld_unix_port, *opt_mysql_tmpdir; |