diff options
| author | serg@serg.mylan <> | 2004-04-06 13:22:10 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-04-06 13:22:10 +0200 |
| commit | 518b601f88d8a5920536ce17adc1a114a201c86e (patch) | |
| tree | 99cad7786ebdb29b764182d4b65db201a39774b6 /sql | |
| parent | 2ae2b946d61ec24c6c24de2bb9d7637b1e6195fc (diff) | |
| parent | c1d87520810d4c27bb93c6f8e5c9e00d8bb6c304 (diff) | |
| download | mariadb-git-518b601f88d8a5920536ce17adc1a114a201c86e.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_prepare.cc | 2 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 66ea32c9af4..0746e3dec54 100644 --- a/sql/sql_prepare.cc +++ b/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 && diff --git a/sql/table.cc b/sql/table.cc index dcd0d39d855..b25517bce10 100644 --- a/sql/table.cc +++ b/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) |