Merge lp:~linuxjedi/drizzle/trunk-bug-639716-take2 into lp:drizzle/7.0

[Andrew Hutchings]

An improved fix for crashes due to join initialization issues.

=== modified file 'drizzled/item/subselect.cc'
--- drizzled/item/subselect.cc	2010-12-25 01:27:46 +0000
+++ drizzled/item/subselect.cc	2011-01-04 20:22:25 +0000
@@ -3022,6 +3022,7 @@
   */
   if (!(tab= (JoinTable*) session->alloc(sizeof(JoinTable))))
     return(true);
+  new (tab) JoinTable();
   tab->table= tmp_table;
   tab->ref.key= 0; /* The only temp table index. */
   tab->ref.key_length= tmp_key->key_length;

=== modified file 'drizzled/join.cc'
--- drizzled/join.cc	2011-01-01 09:24:57 +0000
+++ drizzled/join.cc	2011-01-04 20:22:25 +0000
@@ -1587,7 +1587,7 @@
       if (sort_table_cond)
       {
         if (!curr_table->select)
-          if (!(curr_table->select= new optimizer::SqlSelect))
+          if (!(curr_table->select= new optimizer::SqlSelect()))
             return;
         if (!curr_table->select->cond)
           curr_table->select->cond= sort_table_cond;
@@ -3220,6 +3220,9 @@
   (JoinTable*) session->alloc(sizeof(JoinTable)*table_count)))
     return(true);
 
+  for (i= 0; i < table_count; i++)
+    new (join_tab+i) JoinTable();
+
   join->full_join=0;
 
   used_tables= OUTER_REF_TABLE_BIT;   // Outer row is already read
@@ -4382,6 +4385,7 @@
     if (!(join->join_tab_reexec=
           (JoinTable*) join->session->alloc(sizeof(JoinTable))))
       return(true);
+    new (join->join_tab_reexec) JoinTable();
     if (join->tmp_join)
       join->tmp_join->join_tab_reexec= join->join_tab_reexec;
   }
@@ -4402,7 +4406,6 @@
   join->row_limit=join->unit->select_limit_cnt;
   join->do_send_rows = (join->row_limit) ? 1 : 0;
 
-  join_tab->cache.buff=0;			/* No caching */
   join_tab->table=tmp_table;
   join_tab->select=0;
   join_tab->select_cond=0;

=== modified file 'drizzled/optimizer/range.cc'
--- drizzled/optimizer/range.cc	2010-12-18 04:43:40 +0000
+++ drizzled/optimizer/range.cc	2011-01-04 20:22:25 +0000
@@ -348,7 +348,7 @@
   {
     return 0;
   }
-  if (! (select= new optimizer::SqlSelect))
+  if (! (select= new optimizer::SqlSelect()))
   {
     *error= 1;			// out of memory
     return 0;

=== modified file 'drizzled/sql_select.cc'
--- drizzled/sql_select.cc	2010-12-24 07:15:43 +0000
+++ drizzled/sql_select.cc	2011-01-04 20:22:25 +0000
@@ -78,7 +78,7 @@
 static Item* part_of_refkey(Table *form,Field *field);
 static bool cmp_buffer_with_ref(JoinTable *tab);
 static void change_cond_ref_to_const(Session *session,
-                                     vector<COND_CMP>& save_list,
+                                     list<COND_CMP>& save_list,
                                      Item *and_father,
                                      Item *cond,
                                      Item *field,
@@ -2364,7 +2364,7 @@
   and_level
 */
 static void change_cond_ref_to_const(Session *session,
-                                     vector<COND_CMP>& save_list,
+                                     list<COND_CMP>& save_list,
                                      Item *and_father,
                                      Item *cond,
                                      Item *field,
@@ -2470,7 +2470,7 @@
 }
 
 static void propagate_cond_constants(Session *session, 
-                                     vector<COND_CMP>& save_list, 
+                                     list<COND_CMP>& save_list, 
                                      COND *and_father, 
                                      COND *cond)
 {
@@ -2479,7 +2479,7 @@
     bool and_level= ((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC;
     List_iterator_fast<Item> li(*((Item_cond*) cond)->argument_list());
     Item *item;
-    vector<COND_CMP> save;
+    list<COND_CMP> save;
     while ((item=li++))
     {
       propagate_cond_constants(session, save, and_level ? cond : item, item);
@@ -2487,13 +2487,13 @@
     if (and_level)
     {
       // Handle other found items
-      for (vector<COND_CMP>::iterator iter= save.begin(); iter != save.end(); ++iter)
+      for (list<COND_CMP>::iterator iter= save.begin(); iter != save.end(); ++iter)
       {
-        Item **args= iter->cmp_func->arguments();
+        Item **args= iter->second->arguments();
         if (not args[0]->const_item())
         {
-          change_cond_ref_to_const(session, save_list, iter->and_level,
-                                   iter->and_level, args[0], args[1] );
+          change_cond_ref_to_const(session, save, iter->first,
+                                   iter->first, args[0], args[1] );
         }
       }
     }
@@ -2684,7 +2684,7 @@
                              &join->cond_equal);
 
     /* change field = field to field = const for each found field = const */
-    vector<COND_CMP> temp;
+    list<COND_CMP> temp;
     propagate_cond_constants(session, temp, conds, conds);
     /*
       Remove all instances of item == item

=== modified file 'drizzled/sql_select.h'
--- drizzled/sql_select.h	2010-12-24 07:15:43 +0000
+++ drizzled/sql_select.h	2011-01-04 20:22:25 +0000
@@ -82,11 +82,7 @@
   item->marker should be 0 for all items on entry
   Return in cond_value false if condition is impossible (1 = 2)
 *****************************************************************************/
-struct COND_CMP {
-  Item *and_level;
-  Item_func *cmp_func;
-  COND_CMP(Item *a,Item_func *b) :and_level(a),cmp_func(b) {}
-};
+typedef std::pair<Item*, Item_func*> COND_CMP;
 
 void TEST_join(Join *join);
 

=== modified file 'drizzled/sql_update.cc'
--- drizzled/sql_update.cc	2010-12-24 07:15:43 +0000
+++ drizzled/sql_update.cc	2011-01-04 20:22:25 +0000
@@ -413,7 +413,7 @@
       }
       else
       {
-	select= new optimizer::SqlSelect;
+	select= new optimizer::SqlSelect();
 	select->head=table;
       }
       if (tempfile.reinit_io_cache(internal::READ_CACHE,0L,0,0))

=== modified file 'drizzled/table_reference.h'
--- drizzled/table_reference.h	2010-12-18 04:43:40 +0000
+++ drizzled/table_reference.h	2011-01-04 20:22:25 +0000
@@ -39,6 +39,20 @@
 
 struct table_reference_st
 {
+  table_reference_st() :
+    key_err(false),
+    key_parts(0),
+    key_length(0),
+    key(0),
+    key_buff(NULL),
+    key_buff2(NULL),
+    key_copy(NULL),
+    items(NULL),
+    cond_guards(NULL),
+    null_ref_key(NULL),
+    disable_cache(false)
+  { }
+
   bool key_err;
   uint32_t key_parts; /**< num of key parts */
   uint32_t key_length; /**< length of key_buff */

=== added file 'tests/suite/regression/r/639716.result'
--- tests/suite/regression/r/639716.result	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/r/639716.result	2011-01-04 20:22:25 +0000
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS `a`;
+DROP TABLE IF EXISTS `aa`;
+DROP TABLE IF EXISTS `c`;
+CREATE TABLE `a` (
+`pk` INT NOT NULL DEFAULT '0',
+`col_enum_key` ENUM('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z') DEFAULT NULL,
+PRIMARY KEY (`pk`),
+KEY `col_enum_key` (`col_enum_key`)
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+CREATE TABLE `aa` (
+`pk` INT NOT NULL DEFAULT '0',
+`col_int_not_null_key` INT NOT NULL,
+PRIMARY KEY (`pk`),
+KEY `col_int_not_null_key` (`col_int_not_null_key`)
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+INSERT INTO `aa` VALUES (1,-523436032),(2,1),(3,621543424),(4,880148480),(5,1963982848),(6,8),(7,1445462016),(8,0),(9,-747241472),(10,6);
+CREATE TABLE `c` (
+`pk` INT NOT NULL DEFAULT '0',
+`col_int_key` INT DEFAULT NULL,
+`col_enum_key` ENUM('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z') DEFAULT NULL,
+PRIMARY KEY (`pk`),
+KEY `col_int_key` (`col_int_key`),
+KEY `col_enum_key` (`col_enum_key`)
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+INSERT INTO `c` VALUES (1,NULL,'h');
+SELECT X . `col_int_key` FROM `c` AS X LEFT JOIN `a` AS Y USING ( `col_enum_key` ) WHERE X . `col_enum_key` = ( SELECT `col_int_not_null_key` FROM `aa` WHERE `pk` = 5 ) LIMIT 8 ;
+ERROR HY000: Received an invalid enum value '1963982848'.
+DROP TABLE `a`,`aa`,`c`;

=== added file 'tests/suite/regression/t/639716.test'
--- tests/suite/regression/t/639716.test	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/t/639716.test	2011-01-04 20:22:25 +0000
@@ -0,0 +1,37 @@
+--disable_warnings
+DROP TABLE IF EXISTS `a`;
+DROP TABLE IF EXISTS `aa`;
+DROP TABLE IF EXISTS `c`;
+--enable_warnings
+
+CREATE TABLE `a` (
+  `pk` INT NOT NULL DEFAULT '0',
+  `col_enum_key` ENUM('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z') DEFAULT NULL,
+  PRIMARY KEY (`pk`),
+  KEY `col_enum_key` (`col_enum_key`)
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+
+CREATE TABLE `aa` (
+  `pk` INT NOT NULL DEFAULT '0',
+  `col_int_not_null_key` INT NOT NULL,
+  PRIMARY KEY (`pk`),
+  KEY `col_int_not_null_key` (`col_int_not_null_key`)
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+
+INSERT INTO `aa` VALUES (1,-523436032),(2,1),(3,621543424),(4,880148480),(5,1963982848),(6,8),(7,1445462016),(8,0),(9,-747241472),(10,6);
+
+CREATE TABLE `c` (
+  `pk` INT NOT NULL DEFAULT '0',
+  `col_int_key` INT DEFAULT NULL,
+  `col_enum_key` ENUM('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z') DEFAULT NULL,
+  PRIMARY KEY (`pk`),
+  KEY `col_int_key` (`col_int_key`),
+  KEY `col_enum_key` (`col_enum_key`)
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+
+INSERT INTO `c` VALUES (1,NULL,'h');
+
+--error 1691
+SELECT X . `col_int_key` FROM `c` AS X LEFT JOIN `a` AS Y USING ( `col_enum_key` ) WHERE X . `col_enum_key` = ( SELECT `col_int_not_null_key` FROM `aa` WHERE `pk` = 5 ) LIMIT 8 ;
+
+DROP TABLE `a`,`aa`,`c`;