Merge lp:~stewart/drizzle/remove-enum-query-type into lp:drizzle/7.0

[Stewart Smith]

spotted enum_query_type in drizzled/enum.h which turns out to be completely unused, but passed around everywhere.

=== modified file 'drizzled/enum.h'
--- drizzled/enum.h	2011-01-21 01:09:12 +0000
+++ drizzled/enum.h	2011-03-03 08:34:04 +0000
@@ -25,34 +25,6 @@
 {
 
 /**
-  Query type constants.
-
-  QT_ORDINARY -- ordinary SQL query.
-  QT_IS -- SQL query to be shown in INFORMATION_SCHEMA (in utf8 and without
-  character set introducers).
-
-  @TODO
-
-  Move this out of here once Stew's done with UDF breakout.  The following headers need it:
-
-    sql_lex.h --> included by session.h
-    item.h
-    table.h
-    item_func.h
-    item_subselect.h
-    item_timefunc.h
-    item_sum.h
-    item_cmpfunc.h
-    item_strfunc.h
-*/
-enum enum_query_type
-{
-  QT_ORDINARY,
-  QT_IS
-};
-
-
-/**
  * @TODO Move to a separate header?
  *
  * It's needed by item.h and field.h, which are both inter-dependent

=== modified file 'drizzled/function/bit.h'
--- drizzled/function/bit.h	2011-02-23 23:48:30 +0000
+++ drizzled/function/bit.h	2011-03-03 08:34:04 +0000
@@ -49,9 +49,9 @@
 
   void fix_length_and_dec() { unsigned_flag= 1; }
 
-  virtual void print(String *str, enum_query_type query_type)
+  virtual void print(String *str)
   {
-    print_op(str, query_type);                  
+    print_op(str);
   }
 };
 

=== modified file 'drizzled/function/bit/functions.h'
--- drizzled/function/bit/functions.h	2011-02-23 23:48:30 +0000
+++ drizzled/function/bit/functions.h	2011-03-03 08:34:04 +0000
@@ -71,9 +71,9 @@
   int64_t val_int();
   const char *func_name() const { return "~"; }
 
-  virtual inline void print(String *str, enum_query_type query_type)
+  virtual inline void print(String *str)
   {
-    Item_func::print(str, query_type);
+    Item_func::print(str);
   }
 };
 

=== modified file 'drizzled/function/cast/boolean.cc'
--- drizzled/function/cast/boolean.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/cast/boolean.cc	2011-03-03 08:34:04 +0000
@@ -29,10 +29,10 @@
 namespace function {
 namespace cast {
 
-void Boolean::print(String *str, enum_query_type query_type)
+void Boolean::print(String *str)
 {
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as boolean)"));
 }
 

=== modified file 'drizzled/function/cast/boolean.h'
--- drizzled/function/cast/boolean.h	2011-02-11 21:34:53 +0000
+++ drizzled/function/cast/boolean.h	2011-03-03 08:34:04 +0000
@@ -42,7 +42,7 @@
     collation.set(&my_charset_bin);
     max_length=args[0]->max_length;
   }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   const char *func_name() const { return "cast_as_boolean"; }
 
 private:

=== modified file 'drizzled/function/cast/signed.cc'
--- drizzled/function/cast/signed.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/cast/signed.cc	2011-03-03 08:34:04 +0000
@@ -29,10 +29,10 @@
 namespace function {
 namespace cast {
 
-void Signed::print(String *str, enum_query_type query_type)
+void Signed::print(String *str)
 {
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as signed)"));
 
 }

=== modified file 'drizzled/function/cast/signed.h'
--- drizzled/function/cast/signed.h	2011-02-17 00:14:13 +0000
+++ drizzled/function/cast/signed.h	2011-03-03 08:34:04 +0000
@@ -44,7 +44,7 @@
     unsigned_flag= false;
   }
 
-  void print(String *str, enum_query_type query_type);
+  void print(String *str);
 
   uint32_t decimal_precision() const
   {

=== modified file 'drizzled/function/cast/unsigned.cc'
--- drizzled/function/cast/unsigned.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/cast/unsigned.cc	2011-03-03 08:34:04 +0000
@@ -29,10 +29,10 @@
 namespace function {
 namespace cast {
 
-void Unsigned::print(String *str, enum_query_type query_type)
+void Unsigned::print(String *str)
 {
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as unsigned)"));
 
 }

=== modified file 'drizzled/function/cast/unsigned.h'
--- drizzled/function/cast/unsigned.h	2011-02-17 00:14:13 +0000
+++ drizzled/function/cast/unsigned.h	2011-03-03 08:34:04 +0000
@@ -44,7 +44,7 @@
     unsigned_flag= true;
   }
 
-  void print(String *str, enum_query_type query_type);
+  void print(String *str);
 
   uint32_t decimal_precision() const
   {

=== modified file 'drizzled/function/func.cc'
--- drizzled/function/func.cc	2011-02-24 12:11:50 +0000
+++ drizzled/function/func.cc	2011-03-03 08:34:04 +0000
@@ -448,37 +448,37 @@
 }
 
 
-void Item_func::print(String *str, enum_query_type query_type)
+void Item_func::print(String *str)
 {
   str->append(func_name());
   str->append('(');
-  print_args(str, 0, query_type);
+  print_args(str, 0);
   str->append(')');
 }
 
 
-void Item_func::print_args(String *str, uint32_t from, enum_query_type query_type)
+void Item_func::print_args(String *str, uint32_t from)
 {
   for (uint32_t i=from ; i < arg_count ; i++)
   {
     if (i != from)
       str->append(',');
-    args[i]->print(str, query_type);
+    args[i]->print(str);
   }
 }
 
 
-void Item_func::print_op(String *str, enum_query_type query_type)
+void Item_func::print_op(String *str)
 {
   str->append('(');
   for (uint32_t i=0 ; i < arg_count-1 ; i++)
   {
-    args[i]->print(str, query_type);
+    args[i]->print(str);
     str->append(' ');
     str->append(func_name());
     str->append(' ');
   }
-  args[arg_count-1]->print(str, query_type);
+  args[arg_count-1]->print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/function/func.h'
--- drizzled/function/func.h	2011-02-17 00:14:13 +0000
+++ drizzled/function/func.h	2011-03-03 08:34:04 +0000
@@ -124,9 +124,9 @@
   virtual void split_sum_func(Session *session, Item **ref_pointer_array,
                               List<Item> &fields);
 
-  virtual void print(String *str, enum_query_type query_type);
-  void print_op(String *str, enum_query_type query_type);
-  void print_args(String *str, uint32_t from, enum_query_type query_type);
+  virtual void print(String *str);
+  void print_op(String *str);
+  void print_args(String *str, uint32_t from);
   virtual void fix_num_length_and_dec();
   void count_only_length();
   void count_real_length();

=== modified file 'drizzled/function/get_user_var.cc'
--- drizzled/function/get_user_var.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/get_user_var.cc	2011-03-03 08:34:04 +0000
@@ -130,8 +130,7 @@
 }
 
 
-void Item_func_get_user_var::print(String *str,
-                                   enum_query_type )
+void Item_func_get_user_var::print(String *str)
 {
   str->append(STRING_WITH_LEN("(@"));
   str->append(name.str,name.length);

=== modified file 'drizzled/function/get_user_var.h'
--- drizzled/function/get_user_var.h	2011-02-11 21:34:53 +0000
+++ drizzled/function/get_user_var.h	2011-03-03 08:34:04 +0000
@@ -49,7 +49,7 @@
   type::Decimal *val_decimal(type::Decimal*);
   String *val_str(String* str);
   void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   enum Item_result result_type() const;
   /*
     We must always return variables as strings to guard against selects of type

=== modified file 'drizzled/function/locate.cc'
--- drizzled/function/locate.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/locate.cc	2011-03-03 08:34:04 +0000
@@ -74,16 +74,16 @@
 }
 
 
-void Item_func_locate::print(String *str, enum_query_type query_type)
+void Item_func_locate::print(String *str)
 {
   str->append(STRING_WITH_LEN("locate("));
-  args[1]->print(str, query_type);
+  args[1]->print(str);
   str->append(',');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   if (arg_count == 3)
   {
     str->append(',');
-    args[2]->print(str, query_type);
+    args[2]->print(str);
   }
   str->append(')');
 }

=== modified file 'drizzled/function/locate.h'
--- drizzled/function/locate.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/locate.h	2011-03-03 08:34:04 +0000
@@ -36,7 +36,7 @@
   const char *func_name() const { return "locate"; }
   int64_t val_int();
   void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/math/decimal_typecast.cc'
--- drizzled/function/math/decimal_typecast.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/math/decimal_typecast.cc	2011-03-03 08:34:04 +0000
@@ -97,7 +97,7 @@
 }
 
 
-void Item_decimal_typecast::print(String *str, enum_query_type query_type)
+void Item_decimal_typecast::print(String *str)
 {
   char len_buf[20*3 + 1];
   char *end;
@@ -105,7 +105,7 @@
   uint32_t precision= class_decimal_length_to_precision(max_length, decimals,
                                                  unsigned_flag);
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as decimal("));
 
   end=internal::int10_to_str(precision, len_buf,10);

=== modified file 'drizzled/function/math/decimal_typecast.h'
--- drizzled/function/math/decimal_typecast.h	2011-02-11 21:34:53 +0000
+++ drizzled/function/math/decimal_typecast.h	2011-03-03 08:34:04 +0000
@@ -43,7 +43,7 @@
   enum_field_types field_type() const { return DRIZZLE_TYPE_DECIMAL; }
   void fix_length_and_dec() {};
   const char *func_name() const { return "decimal_typecast"; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/math/int_divide.h'
--- drizzled/function/math/int_divide.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/math/int_divide.h	2011-03-03 08:34:04 +0000
@@ -35,9 +35,9 @@
   const char *func_name() const { return "DIV"; }
   void fix_length_and_dec();
 
-  virtual inline void print(String *str, enum_query_type query_type)
+  virtual inline void print(String *str)
   {
-    print_op(str, query_type);
+    print_op(str);
   }
 
 };

=== modified file 'drizzled/function/num_op.h'
--- drizzled/function/num_op.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/num_op.h	2011-03-03 08:34:04 +0000
@@ -33,9 +33,9 @@
   Item_num_op(Item *a,Item *b) :Item_func_numhybrid(a, b) {}
   virtual void result_precision()= 0;
 
-  virtual inline void print(String *str, enum_query_type query_type)
+  virtual inline void print(String *str)
   {
-    print_op(str, query_type);
+    print_op(str);
   }
 
   void find_num_type();

=== modified file 'drizzled/function/set_user_var.cc'
--- drizzled/function/set_user_var.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/set_user_var.cc	2011-03-03 08:34:04 +0000
@@ -312,12 +312,12 @@
   return entry->val_decimal(&null_value, val);
 }
 
-void Item_func_set_user_var::print(String *str, enum_query_type query_type)
+void Item_func_set_user_var::print(String *str)
 {
   str->append(STRING_WITH_LEN("(@"));
   str->append(name.str, name.length);
   str->append(STRING_WITH_LEN(":="));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/function/set_user_var.h'
--- drizzled/function/set_user_var.h	2010-12-25 01:27:46 +0000
+++ drizzled/function/set_user_var.h	2011-03-03 08:34:04 +0000
@@ -68,7 +68,7 @@
   enum Item_result result_type () const { return cached_result_type; }
   bool fix_fields(Session *session, Item **ref);
   void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   const char *func_name() const { return "set_user_var"; }
   int save_in_field(Field *field, bool no_conversions,

=== modified file 'drizzled/function/str/binary.cc'
--- drizzled/function/str/binary.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/str/binary.cc	2011-03-03 08:34:04 +0000
@@ -24,10 +24,10 @@
 namespace drizzled
 {
 
-void Item_func_binary::print(String *str, enum_query_type query_type)
+void Item_func_binary::print(String *str)
 {
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as binary)"));
 }
 

=== modified file 'drizzled/function/str/binary.h'
--- drizzled/function/str/binary.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/str/binary.h	2011-03-03 08:34:04 +0000
@@ -43,7 +43,7 @@
     collation.set(&my_charset_bin);
     max_length=args[0]->max_length;
   }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   const char *func_name() const { return "cast_as_binary"; }
 };
 

=== modified file 'drizzled/function/str/conv_charset.cc'
--- drizzled/function/str/conv_charset.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/str/conv_charset.cc	2011-03-03 08:34:04 +0000
@@ -47,10 +47,10 @@
   max_length = args[0]->max_length*conv_charset->mbmaxlen;
 }
 
-void Item_func_conv_charset::print(String *str, enum_query_type query_type)
+void Item_func_conv_charset::print(String *str)
 {
   str->append(STRING_WITH_LEN("convert("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" using "));
   str->append(conv_charset->csname);
   str->append(')');

=== modified file 'drizzled/function/str/conv_charset.h'
--- drizzled/function/str/conv_charset.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/str/conv_charset.h	2011-03-03 08:34:04 +0000
@@ -65,7 +65,7 @@
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "convert"; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/str/make_set.cc'
--- drizzled/function/str/make_set.cc	2011-02-24 12:11:50 +0000
+++ drizzled/function/str/make_set.cc	2011-03-03 08:34:04 +0000
@@ -121,14 +121,14 @@
 }
 
 
-void Item_func_make_set::print(String *str, enum_query_type query_type)
+void Item_func_make_set::print(String *str)
 {
   str->append(STRING_WITH_LEN("make_set("));
-  item->print(str, query_type);
+  item->print(str);
   if (arg_count)
   {
     str->append(',');
-    print_args(str, 0, query_type);
+    print_args(str, 0);
   }
   str->append(')');
 }

=== modified file 'drizzled/function/str/make_set.h'
--- drizzled/function/str/make_set.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/str/make_set.h	2011-03-03 08:34:04 +0000
@@ -56,7 +56,7 @@
       Item_str_func::walk(processor, walk_subquery, arg);
   }
   Item *transform(Item_transformer transformer, unsigned char *arg);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/str/set_collation.cc'
--- drizzled/function/str/set_collation.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/str/set_collation.cc	2011-03-03 08:34:04 +0000
@@ -85,10 +85,10 @@
   return 1;
 }
 
-void Item_func_set_collation::print(String *str, enum_query_type query_type)
+void Item_func_set_collation::print(String *str)
 {
   str->append('(');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" collate "));
   assert(args[1]->basic_const_item() &&
               args[1]->type() == Item::STRING_ITEM);

=== modified file 'drizzled/function/str/set_collation.h'
--- drizzled/function/str/set_collation.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/str/set_collation.h	2011-03-03 08:34:04 +0000
@@ -34,7 +34,7 @@
   bool eq(const Item *item, bool binary_cmp) const;
   const char *func_name() const { return "collate"; }
   enum Functype functype() const { return COLLATE_FUNC; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/str/trim.cc'
--- drizzled/function/str/trim.cc	2011-02-21 21:45:55 +0000
+++ drizzled/function/str/trim.cc	2011-03-03 08:34:04 +0000
@@ -220,20 +220,20 @@
   }
 }
 
-void Item_func_trim::print(String *str, enum_query_type query_type)
+void Item_func_trim::print(String *str)
 {
   if (arg_count == 1)
   {
-    Item_func::print(str, query_type);
+    Item_func::print(str);
     return;
   }
   str->append(Item_func_trim::func_name());
   str->append('(');
   str->append(mode_name());
   str->append(' ');
-  args[1]->print(str, query_type);
+  args[1]->print(str);
   str->append(STRING_WITH_LEN(" from "));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/function/str/trim.h'
--- drizzled/function/str/trim.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/str/trim.h	2011-03-03 08:34:04 +0000
@@ -36,7 +36,7 @@
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "trim"; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   virtual const char *mode_name() const { return "both"; }
 };
 

=== modified file 'drizzled/function/time/date_add_interval.cc'
--- drizzled/function/time/date_add_interval.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/time/date_add_interval.cc	2011-03-03 08:34:04 +0000
@@ -154,12 +154,12 @@
           (date_sub_interval == other->date_sub_interval));
 }
 
-void Item_date_add_interval::print(String *str, enum_query_type query_type)
+void Item_date_add_interval::print(String *str)
 {
   str->append('(');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(date_sub_interval?" - interval ":" + interval ");
-  args[1]->print(str, query_type);
+  args[1]->print(str);
   str->append(' ');
   str->append(interval_names[int_type]);
   str->append(')');

=== modified file 'drizzled/function/time/date_add_interval.h'
--- drizzled/function/time/date_add_interval.h	2011-01-25 05:20:15 +0000
+++ drizzled/function/time/date_add_interval.h	2011-03-03 08:34:04 +0000
@@ -42,7 +42,7 @@
   int64_t val_int();
   bool get_date(type::Time &res, uint32_t fuzzy_date);
   bool eq(const Item *item, bool binary_cmp) const;
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/time/extract.cc'
--- drizzled/function/time/extract.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/time/extract.cc	2011-03-03 08:34:04 +0000
@@ -35,12 +35,12 @@
 
 extern const char *interval_names[];
 
-void Item_extract::print(String *str, enum_query_type query_type)
+void Item_extract::print(String *str)
 {
   str->append(STRING_WITH_LEN("extract("));
   str->append(interval_names[int_type]);
   str->append(STRING_WITH_LEN(" from "));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/function/time/extract.h'
--- drizzled/function/time/extract.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/time/extract.h	2011-03-03 08:34:04 +0000
@@ -38,7 +38,7 @@
   const char *func_name() const { return "extract"; }
   void fix_length_and_dec();
   bool eq(const Item *item, bool binary_cmp) const;
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/time/timestamp_diff.cc'
--- drizzled/function/time/timestamp_diff.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/time/timestamp_diff.cc	2011-03-03 08:34:04 +0000
@@ -130,7 +130,7 @@
 }
 
 
-void Item_func_timestamp_diff::print(String *str, enum_query_type query_type)
+void Item_func_timestamp_diff::print(String *str)
 {
   str->append(func_name());
   str->append('(');
@@ -170,7 +170,7 @@
   for (uint32_t i=0 ; i < 2 ; i++)
   {
     str->append(',');
-    args[i]->print(str, query_type);
+    args[i]->print(str);
   }
   str->append(')');
 }

=== modified file 'drizzled/function/time/timestamp_diff.h'
--- drizzled/function/time/timestamp_diff.h	2010-12-18 04:43:40 +0000
+++ drizzled/function/time/timestamp_diff.h	2011-03-03 08:34:04 +0000
@@ -38,7 +38,7 @@
     decimals=0;
     maybe_null=1;
   }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 } /* namespace drizzled */

=== modified file 'drizzled/function/time/typecast.cc'
--- drizzled/function/time/typecast.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/time/typecast.cc	2011-03-03 08:34:04 +0000
@@ -48,20 +48,20 @@
   return 1;
 }
 
-void Item_typecast::print(String *str, enum_query_type query_type)
+void Item_typecast::print(String *str)
 {
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as "));
   str->append(cast_type());
   str->append(')');
 }
 
 
-void Item_char_typecast::print(String *str, enum_query_type query_type)
+void Item_char_typecast::print(String *str)
 {
   str->append(STRING_WITH_LEN("cast("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" as char"));
   if (cast_length >= 0)
   {

=== modified file 'drizzled/function/time/typecast.h'
--- drizzled/function/time/typecast.h	2011-02-11 21:34:53 +0000
+++ drizzled/function/time/typecast.h	2011-03-03 08:34:04 +0000
@@ -49,7 +49,7 @@
     max_length=args[0]->max_length;
   }
   virtual const char* cast_type() const= 0;
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 class Item_typecast_maybe_null :public Item_typecast
@@ -81,7 +81,7 @@
   const char* cast_type() const { return "char"; }
   String *val_str(String *a);
   void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 class Item_date_typecast :public Item_typecast_maybe_null

=== modified file 'drizzled/function/user_var_as_out_param.cc'
--- drizzled/function/user_var_as_out_param.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/user_var_as_out_param.cc	2011-03-03 08:34:04 +0000
@@ -86,8 +86,7 @@
 }
 
 
-void Item_user_var_as_out_param::print(String *str,
-                                       enum_query_type )
+void Item_user_var_as_out_param::print(String *str)
 {
   str->append('@');
   str->append(name.str,name.length);

=== modified file 'drizzled/function/user_var_as_out_param.h'
--- drizzled/function/user_var_as_out_param.h	2010-12-25 01:27:46 +0000
+++ drizzled/function/user_var_as_out_param.h	2011-03-03 08:34:04 +0000
@@ -48,7 +48,7 @@
   type::Decimal *val_decimal(type::Decimal *decimal_buffer);
   /* fix_fields() binds variable name with its entry structure */
   bool fix_fields(Session *session, Item **ref);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   void set_null_value(const CHARSET_INFO * const cs);
   void set_value(const char *str, uint32_t length, const CHARSET_INFO * const cs);
 };

=== modified file 'drizzled/item.cc'
--- drizzled/item.cc	2011-02-28 21:18:08 +0000
+++ drizzled/item.cc	2011-03-03 08:34:04 +0000
@@ -362,14 +362,14 @@
   return class_decimal_int_part(decimal_precision(), decimals);
 }
 
-void Item::print(String *str, enum_query_type)
+void Item::print(String *str)
 {
   str->append(full_name());
 }
 
-void Item::print_item_w_name(String *str, enum_query_type query_type)
+void Item::print_item_w_name(String *str)
 {
-  print(str, query_type);
+  print(str);
 
   if (name)
   {
@@ -740,12 +740,12 @@
                   const char *table_name_arg, const char *field_name_arg)
     :Item_ref(context_arg, item, table_name_arg, field_name_arg) {}
 
-  virtual inline void print (String *str, enum_query_type query_type)
+  virtual inline void print (String *str)
   {
     if (ref)
-      (*ref)->print(str, query_type);
+      (*ref)->print(str);
     else
-      Item_ident::print(str, query_type);
+      Item_ident::print(str);
   }
 };
 

=== modified file 'drizzled/item.h'
--- drizzled/item.h	2011-02-22 21:46:00 +0000
+++ drizzled/item.h	2011-03-03 08:34:04 +0000
@@ -551,9 +551,9 @@
     query and why they should be generated from the Item-tree, @see
     register_view().
   */
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
-  void print_item_w_name(String *, enum_query_type query_type);
+  void print_item_w_name(String *);
   virtual void update_used_tables() {}
   virtual void split_sum_func(Session *session, 
                               Item **ref_pointer_array,

=== modified file 'drizzled/item/cache.cc'
--- drizzled/item/cache.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/cache.cc	2011-03-03 08:34:04 +0000
@@ -55,13 +55,13 @@
 }
 
 
-void Item_cache::print(String *str, enum_query_type query_type)
+void Item_cache::print(String *str)
 {
   str->append(STRING_WITH_LEN("<cache>("));
   if (example)
-    example->print(str, query_type);
+    example->print(str);
   else
-    Item::print(str, query_type);
+    Item::print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/item/cache.h'
--- drizzled/item/cache.h	2011-02-11 21:34:53 +0000
+++ drizzled/item/cache.h	2011-03-03 08:34:04 +0000
@@ -77,7 +77,7 @@
   static Item_cache* get_cache(const Item *item);
   table_map used_tables() const { return used_table_map; }
   virtual void keep_array() {}
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool eq_def(Field *field);
   bool eq(const Item *item, bool) const
   {

=== modified file 'drizzled/item/cmpfunc.cc'
--- drizzled/item/cmpfunc.cc	2011-02-28 21:18:08 +0000
+++ drizzled/item/cmpfunc.cc	2011-03-03 08:34:04 +0000
@@ -347,10 +347,10 @@
   higher than the precedence of NOT.
 */
 
-void Item_func_not::print(String *str, enum_query_type query_type)
+void Item_func_not::print(String *str)
 {
   str->append('(');
-  Item_func::print(str, query_type);
+  Item_func::print(str);
   str->append(')');
 }
 
@@ -382,12 +382,12 @@
           (test_sub_item && !test_sub_item->any_value()));
 }
 
-void Item_func_not_all::print(String *str, enum_query_type query_type)
+void Item_func_not_all::print(String *str)
 {
   if (show)
-    Item_func::print(str, query_type);
+    Item_func::print(str);
   else
-    args[0]->print(str, query_type);
+    args[0]->print(str);
 }
 
 
@@ -1445,10 +1445,10 @@
 }
 
 
-void Item_func_truth::print(String *str, enum_query_type query_type)
+void Item_func_truth::print(String *str)
 {
   str->append('(');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" is "));
   if (! affirmative)
     str->append(STRING_WITH_LEN("not "));
@@ -2176,16 +2176,16 @@
 }
 
 
-void Item_func_between::print(String *str, enum_query_type query_type)
+void Item_func_between::print(String *str)
 {
   str->append('(');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   if (negated)
     str->append(STRING_WITH_LEN(" not"));
   str->append(STRING_WITH_LEN(" between "));
-  args[1]->print(str, query_type);
+  args[1]->print(str);
   str->append(STRING_WITH_LEN(" and "));
-  args[2]->print(str, query_type);
+  args[2]->print(str);
   str->append(')');
 }
 
@@ -2834,26 +2834,26 @@
     Fix this so that it prints the whole CASE expression
 */
 
-void Item_func_case::print(String *str, enum_query_type query_type)
+void Item_func_case::print(String *str)
 {
   str->append(STRING_WITH_LEN("(case "));
   if (first_expr_num != -1)
   {
-    args[first_expr_num]->print(str, query_type);
+    args[first_expr_num]->print(str);
     str->append(' ');
   }
   for (uint32_t i=0 ; i < ncases ; i+=2)
   {
     str->append(STRING_WITH_LEN("when "));
-    args[i]->print(str, query_type);
+    args[i]->print(str);
     str->append(STRING_WITH_LEN(" then "));
-    args[i+1]->print(str, query_type);
+    args[i+1]->print(str);
     str->append(' ');
   }
   if (else_expr_num != -1)
   {
     str->append(STRING_WITH_LEN("else "));
-    args[else_expr_num]->print(str, query_type);
+    args[else_expr_num]->print(str);
     str->append(' ');
   }
   str->append(STRING_WITH_LEN("end)"));
@@ -3794,14 +3794,14 @@
 }
 
 
-void Item_func_in::print(String *str, enum_query_type query_type)
+void Item_func_in::print(String *str)
 {
   str->append('(');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   if (negated)
     str->append(STRING_WITH_LEN(" not"));
   str->append(STRING_WITH_LEN(" in ("));
-  print_args(str, 1, query_type);
+  print_args(str, 1);
   str->append(STRING_WITH_LEN("))"));
 }
 
@@ -4158,19 +4158,19 @@
 }
 
 
-void Item_cond::print(String *str, enum_query_type query_type)
+void Item_cond::print(String *str)
 {
   str->append('(');
   List<Item>::iterator li(list.begin());
   Item *item;
   if ((item=li++))
-    item->print(str, query_type);
+    item->print(str);
   while ((item=li++))
   {
     str->append(' ');
     str->append(func_name());
     str->append(' ');
-    item->print(str, query_type);
+    item->print(str);
   }
   str->append(')');
 }
@@ -4350,10 +4350,10 @@
 }
 
 
-void Item_func_isnotnull::print(String *str, enum_query_type query_type)
+void Item_func_isnotnull::print(String *str)
 {
   str->append('(');
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(STRING_WITH_LEN(" is not null)"));
 }
 
@@ -5166,24 +5166,24 @@
   return Item_func::transform(transformer, arg);
 }
 
-void Item_equal::print(String *str, enum_query_type query_type)
+void Item_equal::print(String *str)
 {
   str->append(func_name());
   str->append('(');
   List<Item_field>::iterator it(fields.begin());
   Item *item;
   if (const_item)
-    const_item->print(str, query_type);
+    const_item->print(str);
   else
   {
     item= it++;
-    item->print(str, query_type);
+    item->print(str);
   }
   while ((item= it++))
   {
     str->append(',');
     str->append(' ');
-    item->print(str, query_type);
+    item->print(str);
   }
   str->append(')');
 }

=== modified file 'drizzled/item/cmpfunc.h'
--- drizzled/item/cmpfunc.h	2011-02-23 15:52:28 +0000
+++ drizzled/item/cmpfunc.h	2011-03-03 08:34:04 +0000
@@ -139,7 +139,7 @@
   virtual bool val_bool();
   virtual int64_t val_int();
   virtual void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
 protected:
   Item_func_truth(Item *a, bool a_value, bool a_affirmative)
@@ -351,9 +351,9 @@
   virtual enum Functype rev_functype() const { return UNKNOWN_FUNC; }
   bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; }
 
-  virtual inline void print(String *str, enum_query_type query_type)
+  virtual inline void print(String *str)
   {
-    Item_func::print_op(str, query_type);
+    Item_func::print_op(str);
   }
 
   bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); }
@@ -386,7 +386,7 @@
   enum Functype functype() const { return NOT_FUNC; }
   const char *func_name() const { return "not"; }
   Item *neg_transformer(Session *session);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 class Item_maxmin_subselect;
@@ -453,7 +453,7 @@
   int64_t val_int();
   enum Functype functype() const { return NOT_ALL_FUNC; }
   const char *func_name() const { return "<not>"; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   void set_sum_test(Item_sum_hybrid *item) { test_sum_item= item; };
   void set_sub_test(Item_maxmin_subselect *item) { test_sub_item= item; };
   bool empty_underlying_subquery();
@@ -615,7 +615,7 @@
   const char *func_name() const { return "between"; }
   bool fix_fields(Session *, Item **);
   void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool is_bool_func() { return 1; }
   const CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
   uint32_t decimal_precision() const { return 1; }
@@ -630,9 +630,9 @@
   optimize_type select_optimize() const { return OPTIMIZE_NONE; }
   const char *func_name() const { return "strcmp"; }
 
-  virtual inline void print(String *str, enum_query_type query_type)
+  virtual inline void print(String *str)
   {
-    Item_func::print(str, query_type);
+    Item_func::print(str);
   }
 };
 
@@ -741,9 +741,9 @@
   uint32_t decimal_precision() const { return args[0]->decimal_precision(); }
   const char *func_name() const { return "nullif"; }
 
-  virtual inline void print(String *str, enum_query_type query_type)
+  virtual inline void print(String *str)
   {
-    Item_func::print(str, query_type);
+    Item_func::print(str);
   }
 
   table_map not_null_tables() const { return 0; }
@@ -1177,7 +1177,7 @@
   enum Item_result result_type () const { return cached_result_type; }
   enum_field_types field_type() const { return cached_field_type; }
   const char *func_name() const { return "case"; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   Item *find_item(String *str);
   const CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
   void cleanup();
@@ -1242,7 +1242,7 @@
   }
   optimize_type select_optimize() const
     { return OPTIMIZE_KEY; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   enum Functype functype() const { return IN_FUNC; }
   const char *func_name() const { return " IN "; }
   bool nulls_in_row();
@@ -1364,7 +1364,7 @@
   table_map not_null_tables() const
   { return abort_on_null ? not_null_tables_cache : 0; }
   Item *neg_transformer(Session *session);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   const CHARSET_INFO *compare_collation() { return args[0]->collation.collation; }
   void top_level_item() { abort_on_null=1; }
 };
@@ -1445,7 +1445,7 @@
   List<Item>* argument_list() { return &list; }
   table_map used_tables() const;
   void update_used_tables();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   void split_sum_func(Session *session, Item **ref_pointer_array, List<Item> &fields);
   friend int setup_conds(Session *session, TableList *tables, TableList *leaves,
                          COND **conds);
@@ -1577,7 +1577,7 @@
   void update_used_tables();
   bool walk(Item_processor processor, bool walk_subquery, unsigned char *arg);
   Item *transform(Item_transformer transformer, unsigned char *arg);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   const CHARSET_INFO *compare_collation()
   { return fields.front().collation.collation; }
 private:

=== modified file 'drizzled/item/decimal.cc'
--- drizzled/item/decimal.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/decimal.cc	2011-03-03 08:34:04 +0000
@@ -108,7 +108,7 @@
   return result;
 }
 
-void Item_decimal::print(String *str, enum_query_type)
+void Item_decimal::print(String *str)
 {
   class_decimal2string(&decimal_value, 0, &str_value);
   str->append(str_value);

=== modified file 'drizzled/item/decimal.h'
--- drizzled/item/decimal.h	2010-12-25 01:27:46 +0000
+++ drizzled/item/decimal.h	2011-03-03 08:34:04 +0000
@@ -53,7 +53,7 @@
   {
     return new Item_decimal(name, &decimal_value, decimals, max_length);
   }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   Item_num *neg()
   {
     class_decimal_neg(&decimal_value);

=== modified file 'drizzled/item/default_value.cc'
--- drizzled/item/default_value.cc	2011-02-24 12:11:50 +0000
+++ drizzled/item/default_value.cc	2011-03-03 08:34:04 +0000
@@ -78,7 +78,7 @@
 }
 
 
-void Item_default_value::print(String *str, enum_query_type query_type)
+void Item_default_value::print(String *str)
 {
   if (!arg)
   {
@@ -86,7 +86,7 @@
     return;
   }
   str->append(STRING_WITH_LEN("default("));
-  arg->print(str, query_type);
+  arg->print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/item/default_value.h'
--- drizzled/item/default_value.h	2010-12-18 04:43:40 +0000
+++ drizzled/item/default_value.h	2011-03-03 08:34:04 +0000
@@ -41,7 +41,7 @@
   enum Type type() const { return DEFAULT_VALUE_ITEM; }
   bool eq(const Item *item, bool binary_cmp) const;
   bool fix_fields(Session *, Item **);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   int save_in_field(Field *field_arg, bool no_conversions);
   table_map used_tables() const { return (table_map)0L; }
 

=== modified file 'drizzled/item/field.cc'
--- drizzled/item/field.cc	2011-02-28 21:18:08 +0000
+++ drizzled/item/field.cc	2011-03-03 08:34:04 +0000
@@ -1266,7 +1266,7 @@
 }
 
 
-void Item_field::print(String *str, enum_query_type query_type)
+void Item_field::print(String *str)
 {
   if (field && field->getTable()->const_table)
   {
@@ -1283,7 +1283,7 @@
     }
     return;
   }
-  Item_ident::print(str, query_type);
+  Item_ident::print(str);
 }
 
 

=== modified file 'drizzled/item/field.h'
--- drizzled/item/field.h	2011-02-11 21:34:53 +0000
+++ drizzled/item/field.h	2011-03-03 08:34:04 +0000
@@ -109,7 +109,7 @@
   Item *safe_charset_converter(const CHARSET_INFO * const tocs);
   int fix_outer_field(Session *session, Field **field, Item **reference);
   virtual Item *update_value_transformer(unsigned char *select_arg);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   friend class Item_default_value;
   friend class Item_insert_value;

=== modified file 'drizzled/item/float.cc'
--- drizzled/item/float.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/float.cc	2011-03-03 08:34:04 +0000
@@ -121,7 +121,7 @@
 }
 
 
-void Item_float::print(String *str, enum_query_type)
+void Item_float::print(String *str)
 {
   if (presentation)
   {

=== modified file 'drizzled/item/float.h'
--- drizzled/item/float.h	2010-12-25 01:27:46 +0000
+++ drizzled/item/float.h	2011-03-03 08:34:04 +0000
@@ -56,7 +56,7 @@
   Item *clone_item()
   { return new Item_float(name, value, decimals, max_length); }
   Item_num *neg() { value= -value; return this; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool eq(const Item *, bool binary_cmp) const;
 };
 
@@ -69,7 +69,7 @@
     :Item_float(NULL, val_arg, decimal_par, length), func_name(str)
   {}
 
-  virtual inline void print(String *str, enum_query_type)
+  virtual inline void print(String *str)
   {
     str->append(func_name);
   }

=== modified file 'drizzled/item/hex_string.cc'
--- drizzled/item/hex_string.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/hex_string.cc	2011-03-03 08:34:04 +0000
@@ -115,7 +115,7 @@
   return 1;
 }
 
-void Item_hex_string::print(String *str, enum_query_type)
+void Item_hex_string::print(String *str)
 {
   char *end= (char*) str_value.ptr() + str_value.length(),
        *ptr= end - min(str_value.length(), sizeof(int64_t));

=== modified file 'drizzled/item/hex_string.h'
--- drizzled/item/hex_string.h	2010-12-25 01:27:46 +0000
+++ drizzled/item/hex_string.h	2011-03-03 08:34:04 +0000
@@ -44,7 +44,7 @@
   enum Item_result result_type () const { return STRING_RESULT; }
   enum Item_result cast_to_int_type() const { return INT_RESULT; }
   enum_field_types field_type() const { return DRIZZLE_TYPE_VARCHAR; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool eq(const Item *item, bool binary_cmp) const;
   virtual Item *safe_charset_converter(const CHARSET_INFO * const tocs);
 };

=== modified file 'drizzled/item/ident.cc'
--- drizzled/item/ident.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/ident.cc	2011-03-03 08:34:04 +0000
@@ -107,8 +107,7 @@
 }
 
 
-void Item_ident::print(String *str,
-                       enum_query_type)
+void Item_ident::print(String *str)
 {
   string d_name, t_name;
 

=== modified file 'drizzled/item/ident.h'
--- drizzled/item/ident.h	2011-02-18 12:05:58 +0000
+++ drizzled/item/ident.h	2011-03-03 08:34:04 +0000
@@ -68,7 +68,7 @@
   const char *full_name() const;
   void cleanup();
   bool remove_dependence_processor(unsigned char * arg);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   virtual bool change_context_processor(unsigned char *cntx)
     { context= (Name_resolution_context *)cntx; return false; }
   friend bool insert_fields(Session *session, Name_resolution_context *context,

=== modified file 'drizzled/item/insert_value.cc'
--- drizzled/item/insert_value.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/insert_value.cc	2011-03-03 08:34:04 +0000
@@ -94,10 +94,10 @@
 }
 
 
-void Item_insert_value::print(String *str, enum_query_type query_type)
+void Item_insert_value::print(String *str)
 {
   str->append(STRING_WITH_LEN("values("));
-  arg->print(str, query_type);
+  arg->print(str);
   str->append(')');
 }
 

=== modified file 'drizzled/item/insert_value.h'
--- drizzled/item/insert_value.h	2011-02-17 00:14:13 +0000
+++ drizzled/item/insert_value.h	2011-03-03 08:34:04 +0000
@@ -45,7 +45,7 @@
      arg(a) {}
   bool eq(const Item *item, bool binary_cmp) const;
   bool fix_fields(Session *, Item **);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   int save_in_field(Field *field_arg, bool no_conversions)
   {
     return Item_field::save_in_field(field_arg, no_conversions);

=== modified file 'drizzled/item/int.cc'
--- drizzled/item/int.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/int.cc	2011-03-03 08:34:04 +0000
@@ -57,7 +57,7 @@
   return str;
 }
 
-void Item_int::print(String *str, enum_query_type)
+void Item_int::print(String *str)
 {
   // my_charset_bin is good enough for numbers
   str_value.set(value, &my_charset_bin);

=== modified file 'drizzled/item/int.h'
--- drizzled/item/int.h	2010-12-25 01:27:46 +0000
+++ drizzled/item/int.h	2011-03-03 08:34:04 +0000
@@ -69,7 +69,7 @@
 
   Item *clone_item() { return new Item_int(name,value,max_length); }
 
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   Item_num *neg() { value= -value; return this; }
 

=== modified file 'drizzled/item/null.cc'
--- drizzled/item/null.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/null.cc	2011-03-03 08:34:04 +0000
@@ -59,7 +59,7 @@
 }
 
 
-void Item_null::print(String *str, enum_query_type)
+void Item_null::print(String *str)
 {
   str->append(STRING_WITH_LEN("NULL"));
 }

=== modified file 'drizzled/item/null.h'
--- drizzled/item/null.h	2011-02-11 21:34:53 +0000
+++ drizzled/item/null.h	2011-03-03 08:34:04 +0000
@@ -53,7 +53,7 @@
   Item *clone_item() { return new Item_null(name); }
   bool is_null() { return true; }
 
-  virtual void print(String *str, enum_query_type);
+  virtual void print(String *str);
 
   Item *safe_charset_converter(const CHARSET_INFO * const tocs);
 };

=== modified file 'drizzled/item/ref.cc'
--- drizzled/item/ref.cc	2011-02-28 21:18:08 +0000
+++ drizzled/item/ref.cc	2011-03-03 08:34:04 +0000
@@ -369,7 +369,7 @@
 }
 
 
-void Item_ref::print(String *str, enum_query_type query_type)
+void Item_ref::print(String *str)
 {
   if (ref)
   {
@@ -379,10 +379,10 @@
       str->append_identifier(name, (uint32_t) strlen(name));
     }
     else
-      (*ref)->print(str, query_type);
+      (*ref)->print(str);
   }
   else
-    Item_ident::print(str, query_type);
+    Item_ident::print(str);
 }
 
 

=== modified file 'drizzled/item/ref.h'
--- drizzled/item/ref.h	2011-02-17 00:14:13 +0000
+++ drizzled/item/ref.h	2011-03-03 08:34:04 +0000
@@ -114,7 +114,7 @@
   }
   bool walk(Item_processor processor, bool walk_subquery, unsigned char *arg)
   { return (*ref)->walk(processor, walk_subquery, arg); }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool result_as_int64_t()
   {
     return (*ref)->result_as_int64_t();

=== modified file 'drizzled/item/ref_null_helper.cc'
--- drizzled/item/ref_null_helper.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/ref_null_helper.cc	2011-03-03 08:34:04 +0000
@@ -75,11 +75,11 @@
   return (owner->was_null|= null_value= (*ref)->get_date(ltime, fuzzydate));
 }
 
-void Item_ref_null_helper::print(String *str, enum_query_type query_type)
+void Item_ref_null_helper::print(String *str)
 {
   str->append(STRING_WITH_LEN("<ref_null_helper>("));
   if (ref)
-    (*ref)->print(str, query_type);
+    (*ref)->print(str);
   else
     str->append('?');
   str->append(')');

=== modified file 'drizzled/item/ref_null_helper.h'
--- drizzled/item/ref_null_helper.h	2011-01-25 05:20:15 +0000
+++ drizzled/item/ref_null_helper.h	2011-03-03 08:34:04 +0000
@@ -48,7 +48,7 @@
   type::Decimal *val_decimal(type::Decimal *);
   bool val_bool();
   bool get_date(type::Time &ltime, uint32_t fuzzydate);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   /*
     we add RAND_TABLE_BIT to prevent moving this item from HAVING to WHERE
   */

=== modified file 'drizzled/item/row.cc'
--- drizzled/item/row.cc	2011-02-24 12:11:50 +0000
+++ drizzled/item/row.cc	2011-03-03 08:34:04 +0000
@@ -149,14 +149,14 @@
   return 0;
 }
 
-void Item_row::print(String *str, enum_query_type query_type)
+void Item_row::print(String *str)
 {
   str->append('(');
   for (uint32_t i= 0; i < arg_count; i++)
   {
     if (i)
       str->append(',');
-    items[i]->print(str, query_type);
+    items[i]->print(str);
   }
   str->append(')');
 }

=== modified file 'drizzled/item/row.h'
--- drizzled/item/row.h	2011-02-17 00:14:13 +0000
+++ drizzled/item/row.h	2011-03-03 08:34:04 +0000
@@ -81,7 +81,7 @@
   bool const_item() const { return const_item_cache; };
   enum Item_result result_type() const { return ROW_RESULT; }
   void update_used_tables();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   bool walk(Item_processor processor, bool walk_subquery, unsigned char *arg);
   Item *transform(Item_transformer transformer, unsigned char *arg);

=== modified file 'drizzled/item/string.cc'
--- drizzled/item/string.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/string.cc	2011-03-03 08:34:04 +0000
@@ -95,9 +95,9 @@
   return 0;
 }
 
-void Item_string::print(String *str, enum_query_type query_type)
+void Item_string::print(String *str)
 {
-  if (query_type == QT_ORDINARY && is_cs_specified())
+  if (is_cs_specified())
   {
     str->append('_');
     str->append(collation.collation->csname);

=== modified file 'drizzled/item/string.h'
--- drizzled/item/string.h	2011-02-11 21:34:53 +0000
+++ drizzled/item/string.h	2011-03-03 08:34:04 +0000
@@ -95,7 +95,7 @@
     str_value.append(str, length);
     max_length= str_value.numchars() * collation.collation->mbmaxlen;
   }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   /**
     Return true if character-set-introducer was explicitly specified in the
@@ -152,7 +152,7 @@
   {}
   Item *safe_charset_converter(const CHARSET_INFO * const tocs);
 
-  virtual inline void print(String *str, enum_query_type)
+  virtual inline void print(String *str)
   {
     str->append(func_name);
   }

=== modified file 'drizzled/item/subselect.cc'
--- drizzled/item/subselect.cc	2011-02-23 15:52:28 +0000
+++ drizzled/item/subselect.cc	2011-03-03 08:34:04 +0000
@@ -406,10 +406,10 @@
 }
 
 
-void Item_subselect::print(String *str, enum_query_type query_type)
+void Item_subselect::print(String *str)
 {
   str->append('(');
-  engine->print(str, query_type);
+  engine->print(str);
   str->append(')');
 }
 
@@ -487,10 +487,10 @@
 }
 
 
-void Item_maxmin_subselect::print(String *str, enum_query_type query_type)
+void Item_maxmin_subselect::print(String *str)
 {
   str->append(max?"<max>":"<min>", 5);
-  Item_singlerow_subselect::print(str, query_type);
+  Item_singlerow_subselect::print(str);
 }
 
 
@@ -718,10 +718,10 @@
 }
 
 
-void Item_exists_subselect::print(String *str, enum_query_type query_type)
+void Item_exists_subselect::print(String *str)
 {
   str->append(STRING_WITH_LEN("exists"));
-  Item_subselect::print(str, query_type);
+  Item_subselect::print(str);
 }
 
 
@@ -1733,16 +1733,16 @@
 }
 
 
-void Item_in_subselect::print(String *str, enum_query_type query_type)
+void Item_in_subselect::print(String *str)
 {
   if (exec_method == IN_TO_EXISTS)
     str->append(STRING_WITH_LEN("<exists>"));
   else
   {
-    left_expr->print(str, query_type);
+    left_expr->print(str);
     str->append(STRING_WITH_LEN(" in "));
   }
-  Item_subselect::print(str, query_type);
+  Item_subselect::print(str);
 }
 
 
@@ -1905,18 +1905,18 @@
 }
 
 
-void Item_allany_subselect::print(String *str, enum_query_type query_type)
+void Item_allany_subselect::print(String *str)
 {
   if (exec_method == IN_TO_EXISTS)
     str->append(STRING_WITH_LEN("<exists>"));
   else
   {
-    left_expr->print(str, query_type);
+    left_expr->print(str);
     str->append(' ');
     str->append(func->symbol(all));
     str->append(all ? " all " : " any ", 5);
   }
-  Item_subselect::print(str, query_type);
+  Item_subselect::print(str);
 }
 
 
@@ -2763,25 +2763,23 @@
 }
 
 
-void subselect_single_select_engine::print(String *str,
-                                           enum_query_type query_type)
-{
-  select_lex->print(session, str, query_type);
-}
-
-
-void subselect_union_engine::print(String *str, enum_query_type query_type)
-{
-  unit->print(str, query_type);
-}
-
-
-void subselect_uniquesubquery_engine::print(String *str,
-                                            enum_query_type query_type)
+void subselect_single_select_engine::print(String *str)
+{
+  select_lex->print(session, str);
+}
+
+
+void subselect_union_engine::print(String *str)
+{
+  unit->print(str);
+}
+
+
+void subselect_uniquesubquery_engine::print(String *str)
 {
   const char *table_name= tab->table->getShare()->getTableName();
   str->append(STRING_WITH_LEN("<primary_index_lookup>("));
-  tab->ref.items[0]->print(str, query_type);
+  tab->ref.items[0]->print(str);
   str->append(STRING_WITH_LEN(" in "));
   if (tab->table->getShare()->isTemporaryCategory())
   {
@@ -2799,7 +2797,7 @@
   if (cond)
   {
     str->append(STRING_WITH_LEN(" where "));
-    cond->print(str, query_type);
+    cond->print(str);
   }
   str->append(')');
 }
@@ -2828,11 +2826,10 @@
 }
 */
 
-void subselect_indexsubquery_engine::print(String *str,
-                                           enum_query_type query_type)
+void subselect_indexsubquery_engine::print(String *str)
 {
   str->append(STRING_WITH_LEN("<index_lookup>("));
-  tab->ref.items[0]->print(str, query_type);
+  tab->ref.items[0]->print(str);
   str->append(STRING_WITH_LEN(" in "));
   str->append(tab->table->getShare()->getTableName(), tab->table->getShare()->getTableNameSize());
   KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
@@ -2843,12 +2840,12 @@
   if (cond)
   {
     str->append(STRING_WITH_LEN(" where "));
-    cond->print(str, query_type);
+    cond->print(str);
   }
   if (having)
   {
     str->append(STRING_WITH_LEN(" having "));
-    having->print(str, query_type);
+    having->print(str);
   }
   str->append(')');
 }
@@ -3244,13 +3241,13 @@
   Print the state of this engine into a string for debugging and views.
 */
 
-void subselect_hash_sj_engine::print(String *str, enum_query_type query_type)
+void subselect_hash_sj_engine::print(String *str)
 {
   str->append(STRING_WITH_LEN(" <materialize> ("));
-  materialize_engine->print(str, query_type);
+  materialize_engine->print(str);
   str->append(STRING_WITH_LEN(" ), "));
   if (tab)
-    subselect_uniquesubquery_engine::print(str, query_type);
+    subselect_uniquesubquery_engine::print(str);
   else
     str->append(STRING_WITH_LEN(
            "<the access method for lookups is not yet created>"

=== modified file 'drizzled/item/subselect.h'
--- drizzled/item/subselect.h	2011-02-17 00:14:13 +0000
+++ drizzled/item/subselect.h	2011-03-03 08:34:04 +0000
@@ -123,7 +123,7 @@
   inline bool get_const_item_cache() { return const_item_cache; }
   Item *get_tmp_table_item(Session *session);
   void update_used_tables();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   virtual bool have_guarded_conds() { return false; }
   bool change_engine(subselect_engine *eng)
   {
@@ -222,7 +222,7 @@
 public:
   Item_maxmin_subselect(Session *session, Item_subselect *parent,
 			Select_Lex *select_lex, bool max);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   void cleanup();
   bool any_value() { return was_values; }
   void register_value() { was_values= true; }
@@ -253,7 +253,7 @@
   type::Decimal *val_decimal(type::Decimal *);
   bool val_bool();
   void fix_length_and_dec();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   friend class select_exists_subselect;
   friend class subselect_uniquesubquery_engine;
@@ -373,7 +373,7 @@
   void top_level_item() { abort_on_null=1; }
   inline bool is_top_level_item() { return abort_on_null; }
   bool test_limit(Select_Lex_Unit *unit);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool fix_fields(Session *session, Item **ref);
   bool setup_engine();
   bool init_left_expr_cache();
@@ -401,7 +401,7 @@
   // only ALL subquery has upper not
   subs_type substype() { return all?ALL_SUBS:ANY_SUBS; }
   trans_res select_transformer(Join *join);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 };
 
 
@@ -470,7 +470,7 @@
   virtual bool may_be_null() { return maybe_null; }
   virtual table_map upper_select_const_tables()= 0;
   static table_map calc_const_tables(TableList *);
-  virtual void print(String *str, enum_query_type query_type)= 0;
+  virtual void print(String *str)= 0;
   virtual bool change_result(Item_subselect *si,
                              select_result_interceptor *result)= 0;
   virtual bool no_tables()= 0;
@@ -504,7 +504,7 @@
   bool uncacheable(uint32_t bit_pos);
   void exclude();
   table_map upper_select_const_tables();
-  virtual void print (String *str, enum_query_type query_type);
+  virtual void print (String *str);
   bool change_result(Item_subselect *si, select_result_interceptor *result);
   bool no_tables();
   bool may_be_null();
@@ -534,7 +534,7 @@
   bool uncacheable(uint32_t bit_pos);
   void exclude();
   table_map upper_select_const_tables();
-  virtual void print (String *str, enum_query_type query_type);
+  virtual void print (String *str);
   bool change_result(Item_subselect *si, select_result_interceptor *result);
   bool no_tables();
   bool is_executed() const;
@@ -592,7 +592,7 @@
   bool uncacheable(uint32_t) { return true; }
   void exclude();
   table_map upper_select_const_tables() { return 0; }
-  virtual void print (String *str, enum_query_type query_type);
+  virtual void print (String *str);
   bool change_result(Item_subselect *si, select_result_interceptor *result);
   bool no_tables();
   int scan_table();
@@ -647,7 +647,7 @@
      having(having_arg)
   {}
   int exec();
-  virtual void print (String *str, enum_query_type query_type);
+  virtual void print (String *str);
   virtual enum_engine_type engine_type() { return INDEXSUBQUERY_ENGINE; }
 };
 
@@ -704,7 +704,7 @@
   void cleanup();
   int prepare() { return 0; }
   int exec();
-  virtual void print (String *str, enum_query_type query_type);
+  virtual void print (String *str);
   uint32_t cols()
   {
     return materialize_engine->cols();

=== modified file 'drizzled/item/sum.cc'
--- drizzled/item/sum.cc	2011-02-24 19:13:33 +0000
+++ drizzled/item/sum.cc	2011-03-03 08:34:04 +0000
@@ -447,14 +447,14 @@
 }
 
 
-void Item_sum::print(String *str, enum_query_type query_type)
+void Item_sum::print(String *str)
 {
   str->append(func_name());
   for (uint32_t i=0 ; i < arg_count ; i++)
   {
     if (i)
       str->append(',');
-    args[i]->print(str, query_type);
+    args[i]->print(str);
   }
   str->append(')');
 }
@@ -3366,7 +3366,7 @@
 }
 
 
-void Item_func_group_concat::print(String *str, enum_query_type query_type)
+void Item_func_group_concat::print(String *str)
 {
   str->append(STRING_WITH_LEN("group_concat("));
   if (distinct)
@@ -3375,7 +3375,7 @@
   {
     if (i)
       str->append(',');
-    args[i]->print(str, query_type);
+    args[i]->print(str);
   }
   if (arg_count_order)
   {
@@ -3384,7 +3384,7 @@
     {
       if (i)
         str->append(',');
-      (*order[i]->item)->print(str, query_type);
+      (*order[i]->item)->print(str);
       if (order[i]->asc)
         str->append(STRING_WITH_LEN(" ASC"));
       else

=== modified file 'drizzled/item/sum.h'
--- drizzled/item/sum.h	2011-02-18 07:12:16 +0000
+++ drizzled/item/sum.h	2011-03-03 08:34:04 +0000
@@ -368,7 +368,7 @@
   virtual bool const_item() const { return forced_const; }
   virtual bool const_during_execution() const { return false; }
   void make_field(SendField *field);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   void fix_num_length_and_dec();
 
   /*
@@ -1043,7 +1043,7 @@
   String* val_str(String* str);
   Item *copy_or_same(Session* session);
   void no_rows_in_result() {}
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   virtual bool change_context_processor(unsigned char *cntx)
     { context= (Name_resolution_context *)cntx; return false; }
 };

=== modified file 'drizzled/item/uint.cc'
--- drizzled/item/uint.cc	2011-02-17 00:14:13 +0000
+++ drizzled/item/uint.cc	2011-03-03 08:34:04 +0000
@@ -47,7 +47,7 @@
   return str;
 }
 
-void Item_uint::print(String *str, enum_query_type)
+void Item_uint::print(String *str)
 {
   // latin1 is good enough for numbers
   str_value.set((uint64_t) value, default_charset());

=== modified file 'drizzled/item/uint.h'
--- drizzled/item/uint.h	2010-12-18 04:43:40 +0000
+++ drizzled/item/uint.h	2011-03-03 08:34:04 +0000
@@ -36,7 +36,7 @@
   String *val_str(String*);
   Item *clone_item() { return new Item_uint(name, value, max_length); }
   int save_in_field(Field *field, bool no_conversions);
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   Item_num *neg ();
   uint32_t decimal_precision() const { return max_length; }
 };

=== modified file 'drizzled/sql_lex.cc'
--- drizzled/sql_lex.cc	2011-02-27 02:20:23 +0000
+++ drizzled/sql_lex.cc	2011-03-03 08:34:04 +0000
@@ -1732,7 +1732,7 @@
                                                  order_group_num)*5)) == 0;
 }
 
-void Select_Lex_Unit::print(String *str, enum_query_type query_type)
+void Select_Lex_Unit::print(String *str)
 {
   bool union_all= !union_distinct;
   for (Select_Lex *sl= first_select(); sl; sl= sl->next_select())
@@ -1747,7 +1747,7 @@
     }
     if (sl->braces)
       str->append('(');
-    sl->print(session, str, query_type);
+    sl->print(session, str);
     if (sl->braces)
       str->append(')');
   }
@@ -1758,16 +1758,14 @@
       str->append(STRING_WITH_LEN(" order by "));
       fake_select_lex->print_order(
         str,
-        (Order *) fake_select_lex->order_list.first,
-        query_type);
+        (Order *) fake_select_lex->order_list.first);
     }
-    fake_select_lex->print_limit(session, str, query_type);
+    fake_select_lex->print_limit(session, str);
   }
 }
 
 void Select_Lex::print_order(String *str,
-                                Order *order,
-                                enum_query_type query_type)
+                             Order *order)
 {
   for (; order; order= order->next)
   {
@@ -1778,7 +1776,7 @@
       str->append(buffer, length);
     }
     else
-      (*order->item)->print(str, query_type);
+      (*order->item)->print(str);
     if (!order->asc)
       str->append(STRING_WITH_LEN(" desc"));
     if (order->next)
@@ -1786,8 +1784,7 @@
   }
 }
 
-void Select_Lex::print_limit(Session *, String *str,
-                                enum_query_type query_type)
+void Select_Lex::print_limit(Session *, String *str)
 {
   Select_Lex_Unit *unit= master_unit();
   Item_subselect *item= unit->item;
@@ -1818,10 +1815,10 @@
     str->append(STRING_WITH_LEN(" limit "));
     if (offset_limit)
     {
-      offset_limit->print(str, query_type);
+      offset_limit->print(str);
       str->append(',');
     }
-    select_limit->print(str, query_type);
+    select_limit->print(str);
   }
 }
 

=== modified file 'drizzled/sql_lex.h'
--- drizzled/sql_lex.h	2011-02-25 21:25:11 +0000
+++ drizzled/sql_lex.h	2011-03-03 08:34:04 +0000
@@ -378,7 +378,7 @@
   inline void unclean() { cleaned= 0; }
   void reinit_exec_mechanism();
 
-  void print(String *str, enum_query_type query_type);
+  void print(String *str);
 
   bool add_fake_select_lex(Session *session);
   void init_prepare_fake_select_lex(Session *session);
@@ -646,11 +646,10 @@
     init_select();
   }
   bool setup_ref_array(Session *session, uint32_t order_group_num);
-  void print(Session *session, String *str, enum_query_type query_type);
-  static void print_order(String *str,
-                          Order *order,
-                          enum_query_type query_type);
-  void print_limit(Session *session, String *str, enum_query_type query_type);
+  void print(Session *session, String *str);
+  static void print_order(String *str, Order *order);
+
+  void print_limit(Session *session, String *str);
   void fix_prepare_information(Session *session, Item **conds, Item **having_conds);
   /*
     Destroy the used execution plan (JOIN) of this subtree (this

=== modified file 'drizzled/sql_parse.cc'
--- drizzled/sql_parse.cc	2011-02-25 21:25:11 +0000
+++ drizzled/sql_parse.cc	2011-03-03 08:34:04 +0000
@@ -583,7 +583,7 @@
         char buff[1024];
         String str(buff,(uint32_t) sizeof(buff), system_charset_info);
         str.length(0);
-        session->getLex()->unit.print(&str, QT_ORDINARY);
+        session->getLex()->unit.print(&str);
         str.append('\0');
         push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
                      ER_YES, str.ptr());

=== modified file 'drizzled/sql_select.cc'
--- drizzled/sql_select.cc	2011-03-01 18:51:28 +0000
+++ drizzled/sql_select.cc	2011-03-03 08:34:04 +0000
@@ -6252,7 +6252,7 @@
 static void print_table_array(Session *session, String *str, TableList **table,
                               TableList **end)
 {
-  (*table)->print(session, str, QT_ORDINARY);
+  (*table)->print(session, str);
 
   for (TableList **tbl= table + 1; tbl < end; tbl++)
   {
@@ -6266,11 +6266,11 @@
       str->append(STRING_WITH_LEN(" straight_join "));
     else
       str->append(STRING_WITH_LEN(" join "));
-    curr->print(session, str, QT_ORDINARY);
+    curr->print(session, str);
     if (curr->on_expr)
     {
       str->append(STRING_WITH_LEN(" on("));
-      curr->on_expr->print(str, QT_ORDINARY);
+      curr->on_expr->print(str);
       str->append(')');
     }
   }
@@ -6281,10 +6281,9 @@
   @param session     thread Cursor
   @param str     string where table should be printed
   @param tables  list of tables in join
-  @query_type    type of the query is being generated
 */
 void print_join(Session *session, String *str,
-                List<TableList> *tables, enum_query_type)
+                List<TableList> *tables)
 {
   /* List is reversed => we should reverse it before using */
   List<TableList>::iterator ti(tables->begin());
@@ -6299,7 +6298,7 @@
   print_table_array(session, str, table, table + tables->size());
 }
 
-void Select_Lex::print(Session *session, String *str, enum_query_type query_type)
+void Select_Lex::print(Session *session, String *str)
 {
   /* QQ: session may not be set for sub queries, but this should be fixed */
   if(not session)
@@ -6332,7 +6331,7 @@
       first= 0;
     else
       str->append(',');
-    item->print_item_w_name(str, query_type);
+    item->print_item_w_name(str);
   }
 
   /*
@@ -6343,7 +6342,7 @@
   {
     str->append(STRING_WITH_LEN(" from "));
     /* go through join tree */
-    print_join(session, str, &top_join_list, query_type);
+    print_join(session, str, &top_join_list);
   }
   else if (where)
   {
@@ -6362,7 +6361,7 @@
   {
     str->append(STRING_WITH_LEN(" where "));
     if (cur_where)
-      cur_where->print(str, query_type);
+      cur_where->print(str);
     else
       str->append(cond_value != Item::COND_FALSE ? "1" : "0");
   }
@@ -6371,7 +6370,7 @@
   if (group_list.size())
   {
     str->append(STRING_WITH_LEN(" group by "));
-    print_order(str, (Order *) group_list.first, query_type);
+    print_order(str, (Order *) group_list.first);
     switch (olap)
     {
       case CUBE_TYPE:
@@ -6394,7 +6393,7 @@
   {
     str->append(STRING_WITH_LEN(" having "));
     if (cur_having)
-      cur_having->print(str, query_type);
+      cur_having->print(str);
     else
       str->append(having_value != Item::COND_FALSE ? "1" : "0");
   }
@@ -6402,11 +6401,11 @@
   if (order_list.size())
   {
     str->append(STRING_WITH_LEN(" order by "));
-    print_order(str, (Order *) order_list.first, query_type);
+    print_order(str, (Order *) order_list.first);
   }
 
   // limit
-  print_limit(session, str, query_type);
+  print_limit(session, str);
 
   // PROCEDURE unsupported here
 }

=== modified file 'drizzled/sql_select.h'
--- drizzled/sql_select.h	2011-02-17 00:14:13 +0000
+++ drizzled/sql_select.h	2011-03-03 08:34:04 +0000
@@ -281,8 +281,7 @@
 COND *remove_eq_conds(Session *session, COND *cond, Item::cond_result *cond_value);
 int test_if_item_cache_changed(List<Cached_item> &list);
 
-void print_join(Session *session, String *str,
-                List<TableList> *tables, enum_query_type);
+void print_join(Session *session, String *str, List<TableList> *tables);
 
 } /* namespace drizzled */
 

=== modified file 'drizzled/table_list.cc'
--- drizzled/table_list.cc	2011-02-24 14:51:56 +0000
+++ drizzled/table_list.cc	2011-03-03 08:34:04 +0000
@@ -261,12 +261,12 @@
   return 0;
 }
 
-void TableList::print(Session *session, String *str, enum_query_type query_type)
+void TableList::print(Session *session, String *str)
 {
   if (nested_join)
   {
     str->append('(');
-    print_join(session, str, &nested_join->join_list, query_type);
+    print_join(session, str, &nested_join->join_list);
     str->append(')');
   }
   else
@@ -276,7 +276,7 @@
     {
       // A derived table
       str->append('(');
-      derived->print(str, query_type);
+      derived->print(str);
       str->append(')');
       cmp_name= "";                               // Force printing of alias
     }

=== modified file 'drizzled/table_list.h'
--- drizzled/table_list.h	2011-02-09 21:31:01 +0000
+++ drizzled/table_list.h	2011-03-03 08:34:04 +0000
@@ -253,7 +253,7 @@
    * 
    * @param str   string where table should be printed
    */
-  void print(Session *session, String *str, enum_query_type query_type);
+  void print(Session *session, String *str);
   /**
    * Sets insert_values buffer
    *

=== modified file 'plugin/benchmark/benchmarkudf.cc'
--- plugin/benchmark/benchmarkudf.cc	2011-02-24 19:13:33 +0000
+++ plugin/benchmark/benchmarkudf.cc	2011-03-03 08:34:04 +0000
@@ -31,7 +31,7 @@
 public:
   BenchmarkFunction() :Item_int_func() {}
   int64_t val_int();
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
 
   const char *func_name() const
   { 
@@ -107,12 +107,12 @@
   return 0;
 }
 
-void BenchmarkFunction::print(String *str, enum_query_type query_type)
+void BenchmarkFunction::print(String *str)
 {
   str->append(STRING_WITH_LEN("benchmark("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(',');
-  args[1]->print(str, query_type);
+  args[1]->print(str);
   str->append(')');
 }
 

=== modified file 'plugin/string_functions/format.cc'
--- plugin/string_functions/format.cc	2011-02-17 00:14:13 +0000
+++ plugin/string_functions/format.cc	2011-03-03 08:34:04 +0000
@@ -130,12 +130,12 @@
 }
 
 
-void Item_func_format::print(String *str, enum_query_type query_type)
+void Item_func_format::print(String *str)
 {
   str->append(STRING_WITH_LEN("format("));
-  args[0]->print(str, query_type);
+  args[0]->print(str);
   str->append(',');
-  args[1]->print(str, query_type);
+  args[1]->print(str);
   str->append(')');
 }
 

=== modified file 'plugin/string_functions/format.h'
--- plugin/string_functions/format.h	2010-12-18 04:43:40 +0000
+++ plugin/string_functions/format.h	2011-03-03 08:34:04 +0000
@@ -34,7 +34,7 @@
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "format"; }
-  virtual void print(String *str, enum_query_type query_type);
+  virtual void print(String *str);
   bool check_argument_count(int n) { return n == 2; }
 };
 

=== modified file 'plugin/utility_functions/assert.cc'
--- plugin/utility_functions/assert.cc	2011-02-17 00:14:13 +0000
+++ plugin/utility_functions/assert.cc	2011-03-03 08:34:04 +0000
@@ -34,7 +34,7 @@
   if (not args[0]->val_bool())
   {
     drizzled::String res;
-    args[0]->print(&res, QT_ORDINARY);
+    args[0]->print(&res);
 
     assert(res.c_ptr());