diff options
| author | unknown <guilhem@gbichot3.local> | 2006-12-20 00:00:46 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-12-20 00:00:46 +0100 |
| commit | 8b998d1199d53baf002f6ad725fa69e4b2f6813b (patch) | |
| tree | 335d7c85728da44b45a4541bf523c09f0ab36f13 /sql/unireg.cc | |
| parent | 8a2b3baaa9da6b94f0f609c1959ad00929ec7621 (diff) | |
| parent | c2f2a41ed32522fa89f5c79fec42ab60e0b4aa62 (diff) | |
| download | mariadb-git-8b998d1199d53baf002f6ad725fa69e4b2f6813b.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
configure.in:
Auto merged
BitKeeper/triggers/post-commit:
merge
include/Makefile.am:
merge
include/my_global.h:
merge
include/my_sys.h:
merge
libmysql/Makefile.shared:
merge
libmysqld/Makefile.am:
merge
mysql-test/mysql-test-run.pl:
merge
mysys/Makefile.am:
merge
mysys/mf_keycache.c:
merge
mysys/mf_keycaches.c:
merge
mysys/my_handler.c:
merge
mysys/my_init.c:
merge
mysys/my_open.c:
merge
mysys/my_pread.c:
merge
sql/Makefile.am:
merge
sql/handler.h:
merge
sql/item_func.cc:
merge
sql/item_func.h:
merge
sql/log.cc:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/set_var.cc:
merge
sql/sql_class.h:
merge
sql/sql_parse.cc:
merge
sql/sql_select.cc:
merge
sql/sql_test.cc:
merge
sql/unireg.cc:
merge
storage/csv/ha_tina.cc:
merge
storage/myisam/ft_boolean_search.c:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisam/ha_myisam.h:
merge
storage/myisam/mi_create.c:
merge
storage/myisam/mi_delete.c:
merge
storage/myisam/mi_dynrec.c:
merge
storage/myisam/mi_key.c:
merge
storage/myisam/mi_open.c:
merge
storage/myisam/mi_test2.c:
merge
storage/myisam/mi_unique.c:
merge
storage/myisam/mi_write.c:
merge
storage/myisam/myisamchk.c:
merge
storage/myisam/myisampack.c:
merge
storage/myisam/sort.c:
merge
unittest/mytap/tap.c:
merge
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 4514f969913..a080de489e9 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -286,8 +286,10 @@ bool mysql_create_frm(THD *thd, const char *file_name, my_free((gptr) keybuff, MYF(0)); if (opt_sync_frm && !(create_info->options & HA_LEX_CREATE_TMP_TABLE) && - my_sync(file, MYF(MY_WME))) - goto err2; + (my_sync(file, MYF(MY_WME)) || + my_sync_dir_by_file(file_name, MYF(MY_WME)))) + goto err2; + if (my_close(file,MYF(MY_WME))) goto err3; |