Merge

mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged

1 files changed, 38 insertions, 0 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 929f85a112d..e615167fa90 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -462,6 +462,24 @@ String *Item_num_op::val_str(String *str)
 }
 
 
+void Item_func_signed::print(String *str)
+{
+  str->append("cast(");
+  args[0]->print(str);
+  str->append("as signed)");
+
+}
+
+
+void Item_func_unsigned::print(String *str)
+{
+  str->append("cast(");
+  args[0]->print(str);
+  str->append("as unsigned)");
+
+}
+
+
 double Item_func_plus::val()
 {
   double value=args[0]->val()+args[1]->val();
@@ -2771,6 +2789,26 @@ double Item_func_match::val()
     DBUG_RETURN(ft_handler->please->find_relevance(ft_handler, record, 0));
 }
 
+void Item_func_match::print(String *str)
+{
+  str->append("(match ");
+  List_iterator_fast<Item> li(fields);
+  Item *item;
+  bool first= 1;
+  while ((item= li++))
+  {
+    if (first)
+      first= 0;
+    else
+      str->append(',');
+    item->print(str);
+  }
+  str->append(" against (");
+  args[0]->print(str);
+  if (mode == FT_BOOL)
+    str->append(" in boolean mode");
+  str->append("))");
+}
 
 longlong Item_func_bit_xor::val_int()
 {