List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:January 26 2009 3:30pm
Subject:bzr commit into mysql-5.1-bugteam branch (chad:2748)
View as plain text  
#At file:///home/cmiller/work/mysqlbzr/mysql-5.1-bugteam/ based on revid:ramil@stripped

 2748 Chad MILLER	2009-01-26 [merge]
      Merge fix for bug 38145 from 5.0.
modified:
  sql/parse_file.cc
  sql/unireg.cc

=== modified file 'sql/parse_file.cc'
--- a/sql/parse_file.cc	2009-01-15 18:11:25 +0000
+++ b/sql/parse_file.cc	2009-01-26 15:27:51 +0000
@@ -266,6 +266,11 @@ sql_create_definition_file(const LEX_STR
   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);

=== modified file 'sql/unireg.cc'
--- a/sql/unireg.cc	2008-12-01 04:17:52 +0000
+++ b/sql/unireg.cc	2009-01-26 15:27:51 +0000
@@ -92,8 +92,8 @@ handle_error(uint sql_errno,
     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, const char *file_name,

Thread
bzr commit into mysql-5.1-bugteam branch (chad:2748) Chad MILLER26 Jan