Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

8 files changed, 19 insertions, 22 deletions

diff --git a/storage/ibmdb2i/db2i_constraints.cc b/storage/ibmdb2i/db2i_constraints.cc
index cc2821238b6..3afa12032d0 100644
--- a/storage/ibmdb2i/db2i_constraints.cc
+++ b/storage/ibmdb2i/db2i_constraints.cc
@@ -421,7 +421,7 @@ void ha_ibmdb2i::free_foreign_key_create_info(char* info)
 
   if (info)
   {
-    my_free(info, MYF(0));
+    my_free(info);
   }
   DBUG_VOID_RETURN;
 }
diff --git a/storage/ibmdb2i/db2i_conversion.cc b/storage/ibmdb2i/db2i_conversion.cc
index 9a85eb01c9b..71a30802bf9 100644
--- a/storage/ibmdb2i/db2i_conversion.cc
+++ b/storage/ibmdb2i/db2i_conversion.cc
@@ -292,7 +292,7 @@ static void get_field_default_value(Field *field,
               if (iconv(iconvD, (char**)&tempIn, &ilen, &tempOut, &olen, &substitutedChars) < 0)
               {
                 warning(current_thd, DB2I_ERR_WARN_COL_ATTRS, field->field_name);
-                my_free(out, MYF(0));
+                my_free(out);
                 return;
               }
               // Now we process the converted string to represent it as 
@@ -310,7 +310,7 @@ static void get_field_default_value(Field *field,
             if (length > 16370)
             {
               warning(current_thd, DB2I_ERR_WARN_COL_ATTRS, field->field_name);
-              my_free(out, MYF(0));
+              my_free(out);
               return;
             }
 
@@ -335,7 +335,7 @@ static void get_field_default_value(Field *field,
             if (field->charset() == &my_charset_bin)
               defaultClause.append(")");              
 
-            my_free(out, MYF(0));
+            my_free(out);
           }
         }
         else
diff --git a/storage/ibmdb2i/db2i_file.cc b/storage/ibmdb2i/db2i_file.cc
index a16aa927527..2d83248eea7 100644
--- a/storage/ibmdb2i/db2i_file.cc
+++ b/storage/ibmdb2i/db2i_file.cc
@@ -280,12 +280,9 @@ void db2i_table::renameAssocFiles(const char* from, const char* to)
 
 db2i_table::~db2i_table()
 {
-  if (blobFieldActualSizes)
-    my_free(blobFieldActualSizes, MYF(0));
+  my_free(blobFieldActualSizes);
+  my_free(conversionDefinitions[toMySQL]);
 
-  if (conversionDefinitions[toMySQL])
-    my_free(conversionDefinitions[toMySQL], MYF(0));
-      
   if (logicalFiles)
   {      
     for (int k = 0; k < logicalFileCount; ++k)
@@ -296,8 +293,8 @@ db2i_table::~db2i_table()
     delete[] logicalFiles;
   }
   delete physicalFile;
-  
-  my_free(db2LibNameEbcdic, 0);  
+
+  my_free(db2LibNameEbcdic);
 }
 
 void db2i_table::getDB2QualifiedName(char* to)
@@ -334,14 +331,14 @@ size_t db2i_table::smartFilenameToTableName(const char *in, char* out, size_t ou
     if ((*cur <= 0x20) || (*cur >= 0x80))
     {
       strncpy(out, in, outlen);
-      my_free(test, MYF(0));
+      my_free(test);
       return min(outlen, strlen(out));
     }
     ++cur;
   }
 
   strncpy(out, test, outlen);
-  my_free(test, MYF(0));
+  my_free(test);
   return min(outlen, strlen(out));
 }
 
diff --git a/storage/ibmdb2i/db2i_file.h b/storage/ibmdb2i/db2i_file.h
index ff35a473b05..6cc6ae8947b 100644
--- a/storage/ibmdb2i/db2i_file.h
+++ b/storage/ibmdb2i/db2i_file.h
@@ -353,7 +353,7 @@ public:
       db2i_ileBridge::getBridgeForThread()->deallocateFile(masterDefn);
     
     if (db2FileName != (char*)db2Table->getDB2TableName(db2i_table::EBCDIC_NATIVE))
-      my_free(db2FileName, MYF(0));    
+      my_free(db2FileName);
   }
 
   // This is roughly equivalent to an "open". It tells ILE to allocate a descriptor
diff --git a/storage/ibmdb2i/db2i_global.h b/storage/ibmdb2i/db2i_global.h
index d201fbd8124..1cf8a9a7c61 100644
--- a/storage/ibmdb2i/db2i_global.h
+++ b/storage/ibmdb2i/db2i_global.h
@@ -131,7 +131,7 @@ void free_aligned(void* p)
 {
   if (likely(p))
   {
-    my_free(*(char**)((char*)p-sizeof(void*)), MYF(0));
+    my_free(*(char**)((char*)p-sizeof(void*)));
   }  
 }
 
diff --git a/storage/ibmdb2i/db2i_ileBridge.cc b/storage/ibmdb2i/db2i_ileBridge.cc
index 68ae2c2bb72..fac98dd7107 100644
--- a/storage/ibmdb2i/db2i_ileBridge.cc
+++ b/storage/ibmdb2i/db2i_ileBridge.cc
@@ -102,7 +102,7 @@ db2i_ileBridge* db2i_ileBridge::createNewBridge(CONNECTION_HANDLE connID)
 void db2i_ileBridge::destroyBridge(db2i_ileBridge* bridge)
 {
   bridge->freeErrorStorage();
-  my_free(bridge, MYF(0)); 
+  my_free(bridge);
 }
 
 
@@ -1306,7 +1306,7 @@ FILE_HANDLE db2i_ileBridge::PreservedHandleList::findAndRemove(const char* fileN
         prev->next = next;
       if (current == head)
         head = next;
-      my_free(current, MYF(0));
+      my_free(current);
       DBUG_PRINT("db2i_ileBridge", ("Found handle %d for %s", uint32(tmp), fileName));
       return tmp;
     }
diff --git a/storage/ibmdb2i/db2i_ileBridge.h b/storage/ibmdb2i/db2i_ileBridge.h
index 10b9820d983..3a3ca141f69 100644
--- a/storage/ibmdb2i/db2i_ileBridge.h
+++ b/storage/ibmdb2i/db2i_ileBridge.h
@@ -320,7 +320,7 @@ public:
   {
     if (likely(connErrText))
     {
-      my_free(connErrText, MYF(0)); 
+      my_free(connErrText);
       connErrText = NULL;
     }
   }
diff --git a/storage/ibmdb2i/ha_ibmdb2i.cc b/storage/ibmdb2i/ha_ibmdb2i.cc
index 81d7e59d8e3..947df8ad2fe 100644
--- a/storage/ibmdb2i/ha_ibmdb2i.cc
+++ b/storage/ibmdb2i/ha_ibmdb2i.cc
@@ -404,7 +404,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
 
 error:
   pthread_mutex_destroy(&share->mutex);
-  my_free((uchar*) share, MYF(0));
+  my_free(share);
   pthread_mutex_unlock(&ibmdb2i_mutex);
 
   return NULL;
@@ -423,7 +423,7 @@ int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share)
     my_hash_delete(&ibmdb2i_open_tables, (uchar*) share);
     thr_lock_delete(&share->lock);
     pthread_mutex_destroy(&share->mutex);
-    my_free(share, MYF(0));
+    my_free(share);
     pthread_mutex_unlock(&ibmdb2i_mutex);
     return 1;
   }
@@ -571,9 +571,9 @@ ha_ibmdb2i::~ha_ibmdb2i()
   DBUG_ASSERT(activeReferences == 0 || outstanding_start_bulk_insert);
     
   if (indexHandles)
-    my_free(indexHandles, MYF(0));
+    my_free(indexHandles);
   if (indexReadSizeEstimates)
-    my_free(indexReadSizeEstimates, MYF(0));
+    my_free(indexReadSizeEstimates);
   
   cleanupBuffers();
 }