diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-17 03:20:11 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-17 03:20:11 -0600 |
| commit | 071634bb3578a3949e09197f7eb17c5619d01562 (patch) | |
| tree | d0d731222454addb05b3890fb2bc555da5af7d63 /sql/unireg.cc | |
| parent | ea0d4516ed796179ef97a791bb04a646ac98610b (diff) | |
| parent | c65bfe456456db2aa60e2275b9ca428c76bbede4 (diff) | |
| download | mariadb-git-071634bb3578a3949e09197f7eb17c5619d01562.tar.gz | |
Merge mysql-next-mr --> mysql-trunk-signal
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 028f774e057..18b0786190a 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -417,10 +417,10 @@ int rea_create_table(THD *thd, const char *path, DBUG_ASSERT(*fn_rext(frm_name)); if (thd->variables.keep_files_on_create) create_info->options|= HA_CREATE_KEEP_FILES; - if (file->ha_create_handler_files(path, NULL, CHF_CREATE_FLAG, create_info)) - goto err_handler; - if (!create_info->frm_only && ha_create_table(thd, path, db, table_name, - create_info,0)) + if (!create_info->frm_only && + (file->ha_create_handler_files(path, NULL, CHF_CREATE_FLAG, + create_info) || + ha_create_table(thd, path, db, table_name, create_info, 0))) goto err_handler; DBUG_RETURN(0); |