diff options
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 5070466007e..3428b9805a0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3388,11 +3388,6 @@ static bool check_merge_table_access(THD *thd, char *db, { if (!tmp->db || !tmp->db[0]) tmp->db=db; - else if (strcmp(tmp->db,db)) - { - send_error(thd,ER_UNION_TABLES_IN_DIFFERENT_DIR); - return 1; - } } error=check_table_access(thd, SELECT_ACL | UPDATE_ACL | DELETE_ACL, table_list); @@ -4425,6 +4420,7 @@ static bool append_file_to_dir(THD *thd, char **filename_ptr, char *table_name) return 0; } + /* Check if the select is a simple select (not an union) |