bzr commit into mysql-trunk-bugfixing branch (davi:3103) Bug#34043

[Davi Arnaut]

# At a local mysql-trunk-bugfixing repository of davi

 3103 Davi Arnaut	2010-07-08
      Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
      
      Post-merge fix: cast argument and correct type in assignment.

    modified:
      client/mysqltest.cc
      sql/filesort.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-07-08 21:20:08 +0000
+++ b/client/mysqltest.cc	2010-07-09 01:19:57 +0000
@@ -6338,7 +6338,7 @@ void free_win_path_patterns()
   for (i=0 ; i < patterns.elements ; i++)
   {
     const char** pattern= dynamic_element(&patterns, i, const char**);
-    my_free(*pattern);
+    my_free((void *) *pattern);
   }
   delete_dynamic(&patterns);
 }

=== modified file 'sql/filesort.cc'
--- a/sql/filesort.cc	2010-07-08 21:20:08 +0000
+++ b/sql/filesort.cc	2010-07-09 01:19:57 +0000
@@ -355,7 +355,7 @@ void filesort_free_buffers(TABLE *table,
     table->sort.sort_keys= NULL;
     my_free(table->sort.buffpek);
     table->sort.buffpek= NULL;
-    table->sort.buffpek_len= NULL;
+    table->sort.buffpek_len= 0;
   }
 
   my_free(table->sort.addon_buf);


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