Merge mysql.com:/home/jimw/my/mysql-4.1-9500

into  mysql.com:/home/jimw/my/mysql-4.1-clean

1 files changed, 5 insertions, 3 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 44b91fd3530..67a80c4ca20 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2988,6 +2988,11 @@ You should consider changing lower_case_table_names to 1 or 2",
     lower_case_table_names= 0;
   }
 
+  /* Reset table_alias_charset, now that lower_case_table_names is set. */
+  table_alias_charset= (lower_case_table_names ?
+			files_charset_info :
+			&my_charset_bin);
+
   select_thread=pthread_self();
   select_thread_in_use=1;
   init_ssl();
@@ -6509,9 +6514,6 @@ static void get_options(int argc,char **argv)
 
   /* Set global variables based on startup options */
   myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);
-  table_alias_charset= (lower_case_table_names ?
-			files_charset_info :
-			&my_charset_bin);
 
   if (opt_short_log_format)
     opt_specialflag|= SPECIAL_SHORT_LOG_FORMAT;