diff options
| author | unknown <monty@mishka.local> | 2005-08-21 13:05:15 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-08-21 13:05:15 +0300 |
| commit | a1820ab1caa44ebde992b587cb561dc38da4c9c6 (patch) | |
| tree | 28d978a13f09fa64fa73658147d500b4e6a24825 /sql/sql_base.cc | |
| parent | 141a36c31b9b9732a479f5b40a2ba35781418ad6 (diff) | |
| parent | 3eda70b270e2d24e6b4bd6662ddc0b2172b47b67 (diff) | |
| download | mariadb-git-a1820ab1caa44ebde992b587cb561dc38da4c9c6.tar.gz | |
Merge mishka.local:/tmp/skr99/mysql-5.0
into mishka.local:/home/my/mysql-5.0
sql/item_strfunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index b8748b89fbd..23b8dae24fb 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -150,14 +150,10 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild) DBUG_ASSERT(share->table_name != 0); if ((!share->table_name)) // To be removed continue; // Shouldn't happen - if (db && my_strcasecmp(system_charset_info, db, share->table_cache_key)) + if (db && my_strcasecmp(system_charset_info, db, share->db)) + continue; + if (wild && wild_compare(share->table_name,wild,0)) continue; - - if (wild) - { - if (wild_compare(share->table_name,wild,0)) - continue; - } /* Check if user has SELECT privilege for any column in the table */ table_list.db= (char*) share->db; @@ -3801,7 +3797,6 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref, if (cur_left_neighbor && cur_table_ref->outer_join & JOIN_TYPE_RIGHT) { - DBUG_ASSERT(cur_table_ref); /* This can happen only for JOIN ... ON. */ DBUG_ASSERT(table_ref->nested_join->join_list.elements == 2); swap_variables(TABLE_LIST*, cur_left_neighbor, cur_table_ref); @@ -3811,7 +3806,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref, store_top_level_join_columns(thd, cur_table_ref, cur_left_neighbor, cur_right_neighbor)) DBUG_RETURN(TRUE); - cur_right_neighbor= cur_table_ref; + cur_right_neighbor= cur_table_ref; } } |