diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 19:30:49 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 19:30:49 +0100 |
| commit | 54d26e027f9b076b3588ec74342a37861af0ce0b (patch) | |
| tree | de394ff69e6896439558c94a82bc72f814d32386 /storage/myisammrg | |
| parent | 851534b5e99d39c52916f08cb6a27ac0305f621e (diff) | |
| parent | 7a10ede8ac35e72852e5443e3963f6f1db668268 (diff) | |
| download | mariadb-git-54d26e027f9b076b3588ec74342a37861af0ce0b.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 3fccb91e9b5..7f305061b41 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -1102,6 +1102,12 @@ void ha_myisammrg::append_create_info(String *packet) packet->append(STRING_WITH_LEN(" INSERT_METHOD=")); packet->append(get_type(&merge_insert_method,file->merge_insert_method-1)); } + /* + There is no sence adding UNION clause in case there is no underlying + tables specified. + */ + if (file->open_tables == file->end_table) + return; packet->append(STRING_WITH_LEN(" UNION=(")); current_db= table->s->db.str; |