1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge fix for bug 38145 from 5.0.

Browse Source
This commit is contained in:
Chad MILLER 2009-01-26 10:27:51 -05:00
commit 34dabc062f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/parse_file.cc
View File

@ -266,6 +266,11 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
if (end_io_cache(&file)) if (end_io_cache(&file))
goto err_w_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))) if (my_close(handler, MYF(MY_WME)))
{ {
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);

4
sql/unireg.cc
View File

@ -92,8 +92,8 @@ handle_error(uint sql_errno,
db_file Handler to use. May be zero, in which case we use db_file Handler to use. May be zero, in which case we use
create_info->db_type create_info->db_type
RETURN RETURN
0 ok false ok
1 error true error
*/ */
bool mysql_create_frm(THD *thd, const char *file_name, bool mysql_create_frm(THD *thd, const char *file_name,