Commit c65c37a9 authored by unknown's avatar unknown
Browse files

Merge production.mysql.com:/usersnfs/rburnett/tmp_merge 

into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt


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
parents a88d3296 49591aa3

sql/mysqld.cc

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ 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 *mysql_data_home= mysql_real_data_home;

char server_version[SERVER_VERSION_LENGTH];

char *mysqld_unix_port, *opt_mysql_tmpdir;