Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled

Post-merge fix: cast argument and correct type in assignment.

client/mysqltest.cc

@@ -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);
 }

sql/filesort.cc

@@ -355,7 +355,7 @@ void filesort_free_buffers(TABLE *table, bool full)
     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);