bk commit into 6.0-falcon tree (holyfoot:1.2524)

[holyfoot]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-15 16:40:43+05:00, holyfoot@stripped +3 -0
  falcon compile error fixed

  sql/item_create.cc@stripped, 2007-05-15 16:40:40+05:00, holyfoot@stripped +9 -2
    create_func_char_cast implemented

  sql/item_create.h@stripped, 2007-05-15 16:40:40+05:00, holyfoot@stripped +3 -0
    create_func_char_cast declared

  sql/sql_yacc.yy@stripped, 2007-05-15 16:40:40+05:00, holyfoot@stripped +1 -2
    use create_func_char_cast instead create_func_cast as the
    casttype is known here

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	hfmain.(none)
# Root:	/d2/hf/mysql-5.1-falcon

--- 1.77/sql/item_create.cc	2007-05-15 16:40:50 +05:00
+++ 1.78/sql/item_create.cc	2007-05-15 16:40:50 +05:00
@@ -4948,6 +4948,14 @@ find_qualified_function_builder(THD *thd
 }
 
 Item*
+create_func_char_cast(THD *thd, Item *a, int len, CHARSET_INFO *cs)
+{
+    CHARSET_INFO *real_cs= (cs ? cs : thd->variables.collation_connection);
+    return new (thd->mem_root) Item_char_typecast(a, len, real_cs);
+}
+
+
+Item*
 create_func_cast(THD *thd, Item *a, Cast_target cast_type, int len, int dec,
                  CHARSET_INFO *cs)
 {
@@ -4986,8 +4994,7 @@ create_func_cast(THD *thd, Item *a, Cast
   }
   case ITEM_CAST_CHAR:
   {
-    CHARSET_INFO *real_cs= (cs ? cs : thd->variables.collation_connection);
-    res= new (thd->mem_root) Item_char_typecast(a, len, real_cs);
+    res= create_func_char_cast(thd, a, len, cs);
     break;
   }
   default:

--- 1.49/sql/item_create.h	2007-05-15 16:40:50 +05:00
+++ 1.50/sql/item_create.h	2007-05-15 16:40:50 +05:00
@@ -150,6 +150,9 @@ protected:
 #endif
 
 
+Item*
+create_func_char_cast(THD *thd, Item *a, int len, CHARSET_INFO *cs);
+
 /**
   Builder for cast expressions.
   @param thd The current thread

--- 1.566/sql/sql_yacc.yy	2007-05-15 16:40:50 +05:00
+++ 1.567/sql/sql_yacc.yy	2007-05-15 16:40:50 +05:00
@@ -6857,8 +6857,7 @@ function_call_conflict:
           }
 	| WEIGHT_STRING_SYM '(' expr AS BINARY ws_nweights ')'
 	  {
-            $3= create_func_cast(YYTHD, $3, ITEM_CAST_CHAR, $6, 0,
-                                 &my_charset_bin);
+            $3= create_func_char_cast(YYTHD, $3, $6, &my_charset_bin);
             $$= new (YYTHD->mem_root)
                 Item_func_weight_string($3, $6, MY_STRXFRM_PAD_WITH_SPACE);
           }