diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-05 15:07:11 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-05 15:07:11 +0300 |
| commit | 20cdcaa3d5b4cadef0dec421c9f4cff65cd28692 (patch) | |
| tree | f85ff74dd2bde9853329089e1992ab938a556db0 | |
| parent | dfbba6e7fda2286a2c021a025fa82926551e01f9 (diff) | |
| parent | d81f6d61044890ecd8c0a83afcf56cd2c75f4c11 (diff) | |
| download | mariadb-git-20cdcaa3d5b4cadef0dec421c9f4cff65cd28692.tar.gz | |
Merge from team tree.
| -rw-r--r-- | sql/parse_file.cc | 5 | ||||
| -rw-r--r-- | sql/unireg.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index ade0709cf0d..c4b07ed9dac 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -249,6 +249,11 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name, if (end_io_cache(&file)) goto err_w_file; + if (opt_sync_frm) { + if (my_sync(handler, MYF(MY_WME))) + goto err_w_file; + } + if (my_close(handler, MYF(MY_WME))) { DBUG_RETURN(TRUE); diff --git a/sql/unireg.cc b/sql/unireg.cc index f20d3e8cc6b..d37bb09d0e8 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -63,8 +63,8 @@ static bool make_empty_rec(THD *thd, int file, enum db_type table_type, db_file Handler to use. May be zero, in which case we use create_info->db_type RETURN - 0 ok - 1 error + false ok + true error */ bool mysql_create_frm(THD *thd, my_string file_name, |