maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/dev/maria-5.3-subqueries-r6/

------------------------------------------------------------
revno: 2754
revision-id: psergey@xxxxxxxxxxxx-20100211220036-qh3iw743tbgwpzax
parent: psergey@xxxxxxxxxxxx-20100211215932-qi36vl0i3zkl86bv
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.3-subqueries-r6
timestamp: Fri 2010-02-12 01:00:36 +0300
message:
  Subquery optimizations: backport
  - Fix valgrind failure: do initialize Item::is_expensive_cache.
=== modified file 'sql/item.cc'
--- a/sql/item.cc	2010-01-17 14:55:08 +0000
+++ b/sql/item.cc	2010-02-11 22:00:36 +0000
@@ -373,8 +373,8 @@
 
 
 Item::Item():
-  rsize(0), name(0), orig_name(0), name_length(0), fixed(0),
-  is_autogenerated_name(TRUE),
+  is_expensive_cache(-1), rsize(0), name(0), orig_name(0), name_length(0),
+  fixed(0), is_autogenerated_name(TRUE),
   collation(&my_charset_bin, DERIVATION_COERCIBLE)
 {
   marker= 0;
@@ -410,6 +410,7 @@
   tables.
 */
 Item::Item(THD *thd, Item *item):
+  is_expensive_cache(-1),
   rsize(0),
   str_value(item->str_value),
   name(item->name),

=== modified file 'sql/item.h'
--- a/sql/item.h	2010-01-28 13:48:33 +0000
+++ b/sql/item.h	2010-02-11 22:00:36 +0000
@@ -513,6 +513,9 @@
 
   enum traverse_order { POSTFIX, PREFIX };
   
+  /* Cache of the result of is_expensive(). */
+  int8 is_expensive_cache;
+  
   /* Reuse size, only used by SP local variable assignment, otherwize 0 */
   uint rsize;
 
@@ -878,9 +881,6 @@
   static CHARSET_INFO *default_charset();
   virtual CHARSET_INFO *compare_collation() { return NULL; }
 
-  /* Cache of the result of is_expensive(). */
-  int8 is_expensive_cache;
-  
   virtual bool walk(Item_processor processor, bool walk_subquery, uchar *arg)
   {
     return (this->*processor)(arg);