MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:May 18 2007 4:55pm
Subject:bk commit into 5.0 tree (msvensson:1.2493) BUG#25285
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-18 18:54:58+02:00, msvensson@stripped +6 -0
  Bug#25285 mysqld got signal 6 when try runing the ./mysql-test-run script
   - The problem is with "array delete" of "class scope placement
     new array" allocated memory in code compiled by "MIPSpro Compilers: Version 7.4.4m".
     That functionality is fortunately used sparsely in MySQL and thus a
     simple "comment it out" will function as a workaround. 
  
     Since MySQL allocate memory in memory pools which will be freed at
     end of query or statement this will not lead to any major memory leak. 
     The memory will be freed, it's just that the destructor will not be run. Theoretically that shouldn't matter unless the class has allocated some resource outside of the memory pool.
  
     This patch will not be pushed to the source repo of MySQL, the users
     of MySQL on IRIX should need to apply it themself.

  sql/item_cmpfunc.cc@stripped, 2007-05-18 18:54:56+02:00, msvensson@stripped +3 -2
    Don't call "array delete"

  sql/item_func.cc@stripped, 2007-05-18 18:54:56+02:00, msvensson@stripped +2 -2
    Don't call "array delete"

  sql/sql_class.h@stripped, 2007-05-18 18:54:56+02:00, msvensson@stripped +1 -1
    Don't call "array delete"

  sql/sql_select.cc@stripped, 2007-05-18 18:54:57+02:00, msvensson@stripped +2 -2
    Don't call "array delete"

  sql/sql_table.cc@stripped, 2007-05-18 18:54:57+02:00, msvensson@stripped +1 -1
    Don't call "array delete"

  sql/sql_update.cc@stripped, 2007-05-18 18:54:57+02:00, msvensson@stripped +3 -2
    Don't call "array delete"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug25285/my50-bug25285-patch_for_IRIX

--- 1.251/sql/item_cmpfunc.cc	2007-05-17 22:17:44 +02:00
+++ 1.252/sql/item_cmpfunc.cc	2007-05-18 18:54:56 +02:00
@@ -2800,8 +2800,9 @@ in_row::in_row(uint elements, Item * ite
 
 in_row::~in_row()
 {
-  if (base)
-    delete [] (cmp_item_row*) base;
+//  if (base)
+//    delete [] (cmp_item_row*) base;
+  base= 0;
 }
 
 byte *in_row::get_value(Item *item)

--- 1.339/sql/item_func.cc	2007-05-17 22:17:45 +02:00
+++ 1.340/sql/item_func.cc	2007-05-18 18:54:56 +02:00
@@ -2797,8 +2797,8 @@ void udf_handler::cleanup()
       free_udf(u_d);
       initialized= FALSE;
     }
-    if (buffers)				// Because of bug in ecc
-      delete [] buffers;
+//    if (buffers)				// Because of bug in ecc
+//      delete [] buffers;
     buffers= 0;
   }
 }

--- 1.332/sql/sql_class.h	2007-05-17 22:17:45 +02:00
+++ 1.333/sql/sql_class.h	2007-05-18 18:54:56 +02:00
@@ -2039,7 +2039,7 @@ public:
   {
     if (copy_field)				/* Fix for Intel compiler */
     {
-      delete [] copy_field;
+//      delete [] copy_field;
       save_copy_field= copy_field= 0;
     }
   }

--- 1.520/sql/sql_select.cc	2007-05-10 09:06:21 +02:00
+++ 1.521/sql/sql_select.cc	2007-05-18 18:54:57 +02:00
@@ -14011,8 +14011,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PA
   DBUG_RETURN(0);
 
  err:
-  if (copy)
-    delete [] param->copy_field;			// This is never 0
+//  if (copy)
+//    delete [] param->copy_field;			// This is never 0
   param->copy_field=0;
 err2:
   DBUG_RETURN(TRUE);

--- 1.343/sql/sql_table.cc	2007-05-11 18:33:11 +02:00
+++ 1.344/sql/sql_table.cc	2007-05-18 18:54:57 +02:00
@@ -4156,7 +4156,7 @@ copy_data_between_tables(TABLE *from,TAB
   }
   end_read_record(&info);
   free_io_cache(from);
-  delete [] copy;				// This is never 0
+//  delete [] copy;				// This is never 0
 
   if (to->file->end_bulk_insert() && error <= 0)
   {

--- 1.217/sql/sql_update.cc	2007-05-11 21:18:46 +02:00
+++ 1.218/sql/sql_update.cc	2007-05-18 18:54:57 +02:00
@@ -1247,8 +1247,9 @@ multi_update::~multi_update()
       }
     }
   }
-  if (copy_field)
-    delete [] copy_field;
+//  if (copy_field)
+//    delete [] copy_field;
+  copy_field= 0;
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;		// Restore this setting
   if (!trans_safe)
     thd->no_trans_update.all= TRUE;
Thread
bk commit into 5.0 tree (msvensson:1.2493) BUG#25285msvensson18 May