List:Commits« Previous MessageNext Message »
From:Mikael Ronstrom Date:August 5 2009 5:37pm
Subject:bzr push into mysql-5.4 branch (mikael:2753 to 2754)
View as plain text  
 2754 Mikael Ronstrom	2009-08-05
      Check stack overrun in find_used_partitions, report all used if overrun
      modified:
        sql/opt_range.cc

 2753 Mikael Ronstrom	2009-08-05
      Fixed a result in a test case in suite parts
      modified:
        mysql-test/suite/parts/inc/partition_key_32col.inc
        mysql-test/suite/parts/r/partition_special_innodb.result
        mysql-test/suite/parts/r/partition_special_myisam.result

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2009-08-04 13:27:11 +0000
+++ b/sql/opt_range.cc	2009-08-05 17:36:24 +0000
@@ -3205,11 +3205,12 @@ int find_used_partitions(PART_PRUNE_PARA
 {
   int res, left_res=0, right_res=0;
   int partno= (int)key_tree->part;
-  bool pushed= FALSE;
   bool set_full_part_if_bad_ret= FALSE;
   bool ignore_part_fields= ppar->ignore_part_fields;
   bool did_set_ignore_part_fields= FALSE;
 
+  if (check_stack_overrun(ppar->range_param.thd, 3*STACK_MIN_SIZE, NULL))
+    return -1;
   if (key_tree->left != &null_element)
   {
     if (-1 == (left_res= find_used_partitions(ppar,key_tree->left)))

Thread
bzr push into mysql-5.4 branch (mikael:2753 to 2754) Mikael Ronstrom5 Aug