Merge rurik.mysql.com:/home/igor/mysql-5.0

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 5 insertions, 5 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 98d6e3f9aba..e40c5dc783d 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1531,9 +1531,9 @@ void st_select_lex_unit::print(String *str)
   {
     if (sl != first_select())
     {
-      str->append(" union ", 7);
+      str->append(STRING_WITH_LEN(" union "));
       if (union_all)
-	str->append("all ", 4);
+	str->append(STRING_WITH_LEN("all "));
       else if (union_distinct == sl)
         union_all= TRUE;
     }
@@ -1547,7 +1547,7 @@ void st_select_lex_unit::print(String *str)
   {
     if (fake_select_lex->order_list.elements)
     {
-      str->append(" order by ", 10);
+      str->append(STRING_WITH_LEN(" order by "));
       fake_select_lex->print_order(str,
 				   (ORDER *) fake_select_lex->
 				   order_list.first);
@@ -1570,7 +1570,7 @@ void st_select_lex::print_order(String *str, ORDER *order)
     else
       (*order->item)->print(str);
     if (!order->asc)
-      str->append(" desc", 5);
+      str->append(STRING_WITH_LEN(" desc"));
     if (order->next)
       str->append(',');
   }
@@ -1593,7 +1593,7 @@ void st_select_lex::print_limit(THD *thd, String *str)
 
   if (explicit_limit)
   {
-    str->append(" limit ", 7);
+    str->append(STRING_WITH_LEN(" limit "));
     if (offset_limit)
     {
       offset_limit->print(str);