diff options
| author | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
| commit | 08e4635fbabb4a4bea3a9b44057a2cd9b12d580f (patch) | |
| tree | 9de56c7859229fc3e173370d434fb24e1a367a1d /sql/unireg.cc | |
| parent | e4e1ae0d13da399d53bd91df791b149f3eae796b (diff) | |
| parent | 27f4f67bd2f35bf710f1a4e4ddde0e42738a195d (diff) | |
| download | mariadb-git-08e4635fbabb4a4bea3a9b44057a2cd9b12d580f.tar.gz | |
merge 5.1-> 5.2
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 cb1e343ff7d..78d375e663a 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -411,10 +411,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); |