Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_prepare.cc:
  Auto merged

sql/sql_prepare.cc

@@ -802,7 +802,7 @@ static int mysql_test_select_fields(Prepared_statement *stmt,
     if (check_table_access(thd, privilege, tables,0))
       DBUG_RETURN(1);
   }
-  else if (check_access(thd, privilege, "*any*",0,0,0))
+  else if (check_access(thd, privilege, any_db,0,0,0))
     DBUG_RETURN(1);
 #endif
   if ((&lex->select_lex != lex->all_selects_list &&

sql/table.cc

@@ -1288,7 +1288,7 @@ bool check_db_name(char *name)
   /* Used to catch empty names and names with end space */
   bool last_char_is_space= TRUE;
 
-  if (lower_case_table_names)
+  if (lower_case_table_names && name != any_db)
     my_casedn_str(files_charset_info, name);
 
   while (*name)