diff options
author | unknown <aelkin/elkin@dsl-hkigw8-febefb00-148.dhcp.inet.fi> | 2006-10-23 14:42:00 +0300 |
---|---|---|
committer | unknown <aelkin/elkin@dsl-hkigw8-febefb00-148.dhcp.inet.fi> | 2006-10-23 14:42:00 +0300 |
commit | 5438ab9cd50aebbd7cb299b8f6dfdc1d1ad3d989 (patch) | |
tree | d7030db72deb2fd6486f28e7c3463a6e6c4b570b /sql/sql_show.cc | |
parent | 81eb1ccda26658d4cae69cc396413bb2819221ff (diff) | |
parent | 61c9a7d55c8238c2aeb95db0260992f936f1fe4a (diff) | |
download | mariadb-git-5438ab9cd50aebbd7cb299b8f6dfdc1d1ad3d989.tar.gz |
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into dsl-hkigw8-febefb00-148.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug22027_create_select_exists
sql/sql_show.cc:
Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
SCCS merged
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 599bca6cbe1..9447123e213 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1058,6 +1058,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, packet->append(STRING_WITH_LEN("CREATE TEMPORARY TABLE ")); else packet->append(STRING_WITH_LEN("CREATE TABLE ")); + if (create_info_arg && + (create_info_arg->options & HA_LEX_CREATE_IF_NOT_EXISTS)) + packet->append(STRING_WITH_LEN("IF NOT EXISTS ")); if (table_list->schema_table) alias= table_list->schema_table->table_name; else |