List:Commits« Previous MessageNext Message »
From:Martin Hansson Date:June 29 2010 1:30pm
Subject:bzr commit into mysql-next-mr branch (martin.hansson:3164)
View as plain text  
#At file:///data0/martin/bzr/refactoring-Item_in_optimizer/n-mr/ based on revid:alik@stripped

 3164 Martin Hansson	2010-06-29
      Refactoring: The constructor for Item_in_optimizer used reinterpret_cast instead of just #include'ing item_subselect.h. This patch does the latter and also predeclares two classes.

    modified:
      sql/item_cmpfunc.h
      sql/item_subselect.h
=== modified file 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h	2010-06-19 07:50:33 +0000
+++ b/sql/item_cmpfunc.h	2010-06-29 13:30:52 +0000
@@ -23,6 +23,7 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
+#include "item_subselect.h"
 #include "thr_malloc.h"                         /* sql_calloc */
 #include "item_func.h"             /* Item_int_func, Item_bool_func */
 
@@ -258,8 +259,8 @@ protected:
   my_bool result_for_null_param;
 public:
   Item_in_optimizer(Item *a, Item_in_subselect *b):
-    Item_bool_func(a, my_reinterpret_cast(Item *)(b)), cache(0),
-    save_cache(0), result_for_null_param(UNKNOWN)
+    Item_bool_func(a, b), cache(0), save_cache(0), 
+    result_for_null_param(UNKNOWN)
   {}
   bool fix_fields(THD *, Item **);
   bool fix_left(THD *thd, Item **ref);

=== modified file 'sql/item_subselect.h'
--- a/sql/item_subselect.h	2010-06-19 07:50:33 +0000
+++ b/sql/item_subselect.h	2010-06-29 13:30:52 +0000
@@ -38,6 +38,9 @@ typedef class st_select_lex SELECT_LEX;
 */
 typedef Comp_creator* (*chooser_compare_func_creator)(bool invert);
 
+class Item_in_optimizer;
+class Item_func_not_all;
+
 /* base class for subselects */
 
 class Item_subselect :public Item_result_field


Attachment: [text/bzr-bundle] bzr/martin.hansson@sun.com-20100629133052-uiy0zcmhx1jytk9m.bundle
Thread
bzr commit into mysql-next-mr branch (martin.hansson:3164) Martin Hansson29 Jun