From: Tor Didriksen
Date: September 22 2010 2:14pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3247)
List-Archive: http://lists.mysql.com/commits/118837
Message-Id: <20100922141502.3EBF33766@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0167595642066025002=="

--===============0167595642066025002==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/next-mr-opt-backporting/ based on revid:jorgen.loland@stripped

 3247 Tor Didriksen	2010-09-22
      Add proper initialization of TABLE_REF objects

    modified:
      sql/sql_select.cc
      sql/sql_select.h
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-09-22 06:51:45 +0000
+++ b/sql/sql_select.cc	2010-09-22 14:14:55 +0000
@@ -10672,7 +10672,7 @@ bool setup_sj_materialization(JOIN_TAB *
       temptable.
     */
     TABLE_REF *tab_ref;
-    if (!(tab_ref= (TABLE_REF*) thd->alloc(sizeof(TABLE_REF))))
+    if (!(tab_ref= new (thd->mem_root) TABLE_REF))
       DBUG_RETURN(TRUE); /* purecov: inspected */
     tab_ref->key= 0; /* The only temp table index. */
     tab_ref->key_length= tmp_key->key_length;
@@ -10879,7 +10879,7 @@ make_join_readinfo(JOIN *join, ulonglong
     {
       if (!(tab->loosescan_buf= (uchar*)join->thd->alloc(tab->
                                                          loosescan_key_len)))
-        return TRUE; /* purecov: inspected */
+        DBUG_RETURN(TRUE); /* purecov: inspected */
     }
     if (sj_is_materialize_strategy(join->best_positions[i].sj_strategy))
     {
@@ -10892,7 +10892,7 @@ make_join_readinfo(JOIN *join, ulonglong
        tab[-1].next_select= sub_select_sjm;
 
       if (setup_sj_materialization(tab))
-        return TRUE;
+        DBUG_RETURN(TRUE);
     }
     switch (tab->type) {
     case JT_EQ_REF:

=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h	2010-09-06 17:56:05 +0000
+++ b/sql/sql_select.h	2010-09-22 14:14:55 +0000
@@ -72,7 +72,7 @@ typedef struct keyuse_t {
 
 class store_key;
 
-typedef struct st_table_ref
+typedef struct st_table_ref : public Sql_alloc
 {
   bool		key_err;
   /** True if something was read into buffer in join_read_key.  */
@@ -116,6 +116,25 @@ typedef struct st_table_ref
   */
   bool          disable_cache;
 
+  st_table_ref()
+    : key_err(FALSE),
+      has_record(FALSE),
+      key_parts(0),
+      key_length(0),
+      key(0),
+      key_buff(NULL),
+      key_buff2(NULL),
+      key_copy(NULL),
+      items(NULL),
+      cond_guards(NULL),
+      null_rejecting(0),
+      depend_map(0),
+      null_ref_key(NULL),
+      use_count(0),
+      disable_cache(FALSE)
+  {
+  }
+
   /**
     @returns whether the reference contains NULL values which could never give
     a match.


--===============0167595642066025002==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   9xycvu1lksw9gsoq
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting/
# testament_sha1: 97b4ab16169e5ba7b52768aad66f3e7298cbbc00
# timestamp: 2010-09-22 16:15:01 +0200
# base_revision_id: jorgen.loland@stripped\
#   4fe3hk8ejj6vml78
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT3pUgIAAoHfgFQQcHf//3eF
HgC////6UAWPdsAAqqUUAOmEoppqmaZGmmjJoxRgT1DTTI0NNGQYQapPKeptRpkG9UNDRoAaGmmj
IZNDRkCKn5KbUBkZDIaDJkaGCMIGhoyMOYBMBMjACMTEwmEwQ0xNMBJIJkAEZEwFT9J6FT9NUzU9
HpM1DUYyR0QOkMlEEWF/S3dz3muiB+aURFOtnSeBo47FCIlNdWvuv5Qg+FE8xIT0I9X/b104mw1D
MwMx9fZH9QpY7NiJCRbjgWEQQETkSVz7eMr4D3UpadBQH476FkDndNYyZkjAOHhTfx5bvDAS5hZr
yMVEILXC29Lx44b991r0bGbiDUtN/bjw5+2wi5wwzmcOPxppEtxmf2hf2bwWdruZ3vJbYGcjaGNM
1V3IVKB6rDrguQ+yRvqoQuzu4T/AIxQmZMhXBi9EvQdE3jg9H0MD1KQ4Gchf1MKT/aKFmUOYsBmD
ychPKnB/pkRS2G3xsOEciNDyc8Gu11FhL9sgeA4mEgPCvzhAvNMj58nFvzB02uJlhmwVmR9gKnz0
UdurTuvQrSqINIcBnuBfjPElaamRVbWXjiY6JAO4cbiLi7HMqphUUhiQpGpLGJsBAuGrLsIltzgx
YBrbNhAetu40MQ5k77Rr2GugDAZxfmQLmYKN9Zi+QGg59cpA+inDa1gZltTzTXd7zXlhS6jhU8G2
Uj1EowyyeDJmNh9gqCDYXMFxxx+RhDfebHjx+3nlxOxhkTV+sJtrDSVk3Wjh4xrLlowYOHPcQHJx
hVKurUPIDpBzCGlMgi4SrTBI1yC6siV2fEDoB9/ppqomVMV6Oc+9osGDLKh4NQ0VNEptPzPVV7PP
qWEYOHcOYdBoka0FQOJqSp60Kiqv2fhr4FzinIr8g+RI/RRHi7DhVqgiL7hAwJKtRKS+ZUfQUyJz
KtpCqrJOMJaHEGtXYw01xk/kwSwJnYJiMw8VG/8iROtj5Hp8Pph+aFZCb0ep12FcNQa7fnaBnBZc
ZH5a4xwm+iBDRpyXTpt6kuNkHdKBWmStZLIpQMpZsLlJBH7KnCrjc4ZhKIlj9qejN3lLkDgGMefL
vNOuo9v1Mcg/AkDoG6KHilmfC/Vpog9yf4lQjU3KfeZskuWKd4MjotMMpmH62dRx/Co8gpMWohgk
fyWMDM9L+WNba+jceho8qP3Oj6gfr8Gp/lxcLbqHXgyDLOxfumDLhF2+mfjHpYUorNRNGgEaL+jH
LcHIc94ww284OPeKK8ilYH3PI/M6zPeaoG44D7TtNkP2hAntMDsA6sGUqnUknFoEqay5WDgSIjQt
rFSROQ9ttD4yID5/V6kI7Ggom/MV7x58uWuMdiK6kbMezzVQNxDThy6PC4OB7wnWW7mWtikhBEuo
iQDHmqwvRCQPCDxhcQ1EiaExgwxIVUj4EO83+IHd4EGu9wNeJWWc1I89uBquJ7wq7FM1Ud/An/lj
qRgZOcgdwKYIYHwaFMVCbokyk9CGqQnMHE4D1gsS3XU7oPDgkpCb0zJBjCtJw3r3oNEJkR7wvXUg
tHNEsNuVYstrDBvgofHZUdT07HlfRwqLbanDAbxlavZhf9KiFWO6uCCC8Rwg8Wo13shyV/hgqApo
8hD1ifA3RMCRRW0WV45qdxGH4a54QrFoIx6Mnk0MRCvA7AfE+rMz6Tk9wzFuY1iHNaBhjVZIzVMK
IODgEHmQY9RJEuBqKs2F0pbtBYyLouKUgh7BGQNIm8KeHiA43mGm+nkUnuytl5UlBFl2OKLDQHGI
DVAepI6UFpQL4gYOvZwwuhzA59c8iiV4VHvMvEJiP8XckU4UJA96VICA


--===============0167595642066025002==--