bk commit into 6.0-falcon tree (hakank:1.2517)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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 15:09:36+02:00, hakank@stripped +3 -0
  Merge lu0011.wdf.sap.corp:/home/hakan/work/mysql/mysql-5.1-falcon-local-master
  into  lu0011.wdf.sap.corp:/home/hakan/work/mysql/mysql-5.1-falcon-to-merge
  MERGE: 1.2502.3.18

  sql/item_create.cc@stripped, 2007-05-15 15:09:34+02:00, hakank@stripped +4 -26
    Hand merge.
    MERGE: 1.76.1.2

  sql/item_create.h@stripped, 2007-05-15 15:06:15+02:00, hakank@stripped +0 -0
    Auto merged
    MERGE: 1.49.1.1

  sql/sql_yacc.yy@stripped, 2007-05-15 15:06:15+02:00, hakank@stripped +0 -0
    Auto merged
    MERGE: 1.564.1.3

# 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:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon-to-merge/RESYNC

--- 1.80/sql/item_create.cc	2007-05-15 15:04:25 +02:00
+++ 1.81/sql/item_create.cc	2007-05-15 15:09:34 +02:00
@@ -1732,19 +1732,6 @@
 };
 
 
-class Create_func_reverse : public Create_func_arg1
-{
-public:
-  virtual Item* create(THD *thd, Item *arg1);
-
-  static Create_func_reverse s_singleton;
-
-protected:
-  Create_func_reverse() {}
-  virtual ~Create_func_reverse() {}
-};
-
-
 class Create_func_round : public Create_native_func
 {
 public:
@@ -3916,7 +3903,6 @@
 Item*
 Create_func_master_pos_wait::create_native(THD *thd, LEX_STRING name,
                                            List<Item> *item_list)
-
 {
   Item *func= NULL;
   int arg_count= 0;
@@ -4168,15 +4154,6 @@
 }
 
 
-Create_func_reverse Create_func_reverse::s_singleton;
-
-Item*
-Create_func_reverse::create(THD *thd, Item *arg1)
-{
-  return new (thd->mem_root) Item_func_reverse(arg1);
-}
-
-
 Create_func_round Create_func_round::s_singleton;
 
 Item*
@@ -4969,6 +4946,13 @@
 find_qualified_function_builder(THD *thd)
 {
   return & Create_sp_func::s_singleton;
+}
+
+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);
 }
 
 

--- 1.50/sql/item_create.h	2007-05-11 10:05:17 +02:00
+++ 1.51/sql/item_create.h	2007-05-15 15:06:15 +02:00
@@ -150,6 +150,9 @@
 #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.568/sql/sql_yacc.yy	2007-05-15 14:54:42 +02:00
+++ 1.569/sql/sql_yacc.yy	2007-05-15 15:06:15 +02:00
@@ -6879,8 +6879,7 @@
           }
 	| 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);
           }