diff options
| author | unknown <svoj@june.mysql.com> | 2008-03-14 20:00:04 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2008-03-14 20:00:04 +0400 |
| commit | 3beb2d1a5d6bce175bbaed7556105ad406af88df (patch) | |
| tree | 3c20e5e9cd7a7fbda89c653281c42ae9ca2d3850 /storage | |
| parent | 4afe31568b1b30d71d85b4ede412417c657d712f (diff) | |
| parent | 7e01efff53ea45c053b4e99336271d661bab7754 (diff) | |
| download | mariadb-git-3beb2d1a5d6bce175bbaed7556105ad406af88df.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.1-engines
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:
After merge fix.
Diffstat (limited to 'storage')
| -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; |