summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-11-02 15:55:25 +0200
committerunknown <monty@mysql.com>2003-11-02 15:55:25 +0200
commit7960f2c4a88344109fb2b21bb830a07628a3365a (patch)
tree143cc73b79c9bf6a804db566adf1ddb19ca7e340 /sql
parentb920ab261e7aea61a7b8a5b950faafa1ce719d4c (diff)
parentc97a38c4d3b2afd4c93771fca61eede965fe71cf (diff)
downloadmariadb-git-7960f2c4a88344109fb2b21bb830a07628a3365a.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/unireg.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 5183f471fa2..ff42bfae0f0 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -150,16 +150,19 @@ int rea_create_table(my_string file_name,
my_free((gptr) screen_buff,MYF(0));
my_afree((gptr) keybuff);
- VOID(my_close(file,MYF(MY_WME)));
- if (ha_create_table(file_name,create_info,0))
+ if (my_sync(file, MYF(MY_WME)))
goto err2;
+ if (my_close(file,MYF(MY_WME)) ||
+ ha_create_table(file_name,create_info,0))
+ goto err3;
DBUG_RETURN(0);
err:
my_free((gptr) screen_buff,MYF(0));
my_afree((gptr) keybuff);
+err2:
VOID(my_close(file,MYF(MY_WME)));
- err2:
+err3:
my_delete(file_name,MYF(0));
DBUG_RETURN(1);
} /* rea_create_table */