bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2863) Bug#48250

[Bjorn Munch]

#At file:///home/bm136801/my/embmut-51/ based on revid:bjorn.munch@stripped

 2863 Bjorn Munch	2009-11-26
      Bug #48250 mysqtest_embedded can lock destroyed mutex
      As suggested, replaced relevant uses of my_fopen with fopen (and close)
      Tested on HPUX where it was reproducable with test innodb_bug30919

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-11-11 11:46:19 +0000
+++ b/client/mysqltest.cc	2009-11-26 10:16:06 +0000
@@ -1119,7 +1119,7 @@ void close_files()
     if (cur_file->file && cur_file->file != stdin)
     {
       DBUG_PRINT("info", ("closing file: %s", cur_file->file_name));
-      my_fclose(cur_file->file, MYF(0));
+      fclose(cur_file->file);
     }
     my_free((uchar*) cur_file->file_name, MYF(MY_ALLOW_ZERO_PTR));
     cur_file->file_name= 0;
@@ -2441,7 +2441,7 @@ int open_file(const char *name)
   if (cur_file == file_stack_end)
     die("Source directives are nesting too deep");
   cur_file++;
-  if (!(cur_file->file = my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
+  if (!(cur_file->file = fopen(buff, "rb")))
   {
     cur_file--;
     die("Could not open '%s' for reading, errno: %d", buff, errno);
@@ -5286,7 +5286,7 @@ int read_line(char *buf, int size)
   found_eof:
       if (cur_file->file != stdin)
       {
-	my_fclose(cur_file->file, MYF(0));
+	fclose(cur_file->file);
         cur_file->file= 0;
       }
       my_free((uchar*) cur_file->file_name, MYF(MY_ALLOW_ZERO_PTR));
@@ -5865,7 +5865,7 @@ get_one_option(int optid, const struct m
     fn_format(buff, argument, "", "", MY_UNPACK_FILENAME);
     DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);
     if (!(cur_file->file=
-          my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
+          fopen(buff, "rb")))
       die("Could not open '%s' for reading, errno: %d", buff, errno);
     cur_file->file_name= my_strdup(buff, MYF(MY_FAE));
     cur_file->lineno= 1;


Attachment: [text/bzr-bundle] bzr/[e-mail]