diff options
| author | unknown <anozdrin/alik@ibm.> | 2008-01-19 22:32:48 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@ibm.> | 2008-01-19 22:32:48 +0300 |
| commit | b9ec8f6aba970ab4ae4da7b8281dd6e520cc941e (patch) | |
| tree | e55cc90ad546ff1606eb9c8a3fac816a5662827e /sql/unireg.cc | |
| parent | 37ff91b3bfdb946743e36ddd13bfda71598f45a8 (diff) | |
| parent | bab13c892d75f704cde64df7252620f4680b3722 (diff) | |
| download | mariadb-git-b9ec8f6aba970ab4ae4da7b8281dd6e520cc941e.tar.gz | |
Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index aab3f5606a8..38f09a7946c 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -401,7 +401,7 @@ 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->create_handler_files(path, NULL, CHF_CREATE_FLAG, create_info)) + 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)) @@ -409,7 +409,7 @@ int rea_create_table(THD *thd, const char *path, DBUG_RETURN(0); err_handler: - VOID(file->create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info)); + VOID(file->ha_create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info)); my_delete(frm_name, MYF(0)); DBUG_RETURN(1); } /* rea_create_table */ |