diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-07-01 19:05:31 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-07-01 19:05:31 +0300 |
| commit | 4354fcd6abc572f94898e714d462fb48a324abd8 (patch) | |
| tree | 80e252b921cc613052133be364c48d1d93285958 /sql/sql_parse.cc | |
| parent | 69df67fbcfef13a7bee18527776495f32e99b043 (diff) | |
| parent | ff1f63e851b26cfae98845439172a3076bd27f77 (diff) | |
| download | mariadb-git-4354fcd6abc572f94898e714d462fb48a324abd8.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1
mysql-test/r/subselect.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 6ebb338f872..0db6ce8a642 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3393,11 +3393,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); @@ -4430,6 +4425,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) |