bk commit into 5.1 tree (gkodinov:1.2504)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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-03-26 14:04:20+03:00, gkodinov@stripped +2 -0
  Merge bk-internal:/home/bk/mysql-5.1-opt
  into  magare.gmz:/home/kgeorge/mysql/work/B26303-5.1-opt
  MERGE: 1.2473.30.1

  sql/item.cc@stripped, 2007-03-26 14:04:17+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.255.1.1

  sql/item.h@stripped, 2007-03-26 14:04:17+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.230.2.1

# 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:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/work/B26303-5.1-opt/RESYNC

--- 1.258/sql/item.cc	2007-03-22 21:55:44 +02:00
+++ 1.259/sql/item.cc	2007-03-26 14:04:17 +03:00
@@ -1088,7 +1088,7 @@ bool Item_splocal::set_value(THD *thd, s
   Item_case_expr methods
 *****************************************************************************/
 
-Item_case_expr::Item_case_expr(int case_expr_id)
+Item_case_expr::Item_case_expr(uint case_expr_id)
   :Item_sp_variable( C_STRING_WITH_LEN("case_expr")),
    m_case_expr_id(case_expr_id)
 {
@@ -1125,6 +1125,8 @@ Item_case_expr::this_item_addr(THD *thd,
 
 void Item_case_expr::print(String *str)
 {
+  if (str->reserve(MAX_INT_WIDTH + sizeof("case_expr@")))
+    return;                                    /* purecov: inspected */
   VOID(str->append(STRING_WITH_LEN("case_expr@")));
   str->qs_append(m_case_expr_id);
 }

--- 1.234/sql/item.h	2007-03-22 10:22:13 +02:00
+++ 1.235/sql/item.h	2007-03-26 14:04:17 +03:00
@@ -1116,7 +1116,7 @@ inline Item_result Item_splocal::result_
 class Item_case_expr :public Item_sp_variable
 {
 public:
-  Item_case_expr(int case_expr_id);
+  Item_case_expr(uint case_expr_id);
 
 public:
   Item *this_item();
@@ -1135,7 +1135,7 @@ public:
   void print(String *str);
 
 private:
-  int m_case_expr_id;
+  uint m_case_expr_id;
 };
 
 /*****************************************************************************