bk commit into 5.0 tree (ramil:1.2484) BUG#28464

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-18 12:08:07+05:00, ramil@stripped +5 -0
  Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
  
  Problem: we may get syntactically incorrect queries in the binary log 
  if we use a string value user variable executing a PS which 
  contains '... limit ?' clause, e.g.
  prepare s from "select 1 limit ?"; 
  set @a='qwe'; execute s using @a;
    
  Fix: raise an error in such cases.

  mysql-test/r/limit.result@stripped, 2007-05-18 12:08:05+05:00, ramil@stripped +11 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - test result

  mysql-test/t/limit.test@stripped, 2007-05-18 12:08:05+05:00, ramil@stripped +17 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - test case

  sql/item.cc@stripped, 2007-05-18 12:08:05+05:00, ramil@stripped +3 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - if Item_param::strict_type is set, check given and required types,
        return an error if not equal.

  sql/item.h@stripped, 2007-05-18 12:08:05+05:00, ramil@stripped +8 -1
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - bool strict_type introduced, which indicates that a parameter value must be of 
        the required_result_type type.
      - set_strict_type() function introduced to set required type.

  sql/sql_yacc.yy@stripped, 2007-05-18 12:08:05+05:00, ramil@stripped +3 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - as we accept only INTs in the 'limit' clause set parameter's required type.

# 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:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b28464.new/b28464.new.5.0

--- 1.266/sql/item.cc	2007-05-18 12:08:11 +05:00
+++ 1.267/sql/item.cc	2007-05-18 12:08:11 +05:00
@@ -2312,6 +2312,7 @@ default_set_param_func(Item_param *param
 
 
 Item_param::Item_param(unsigned pos_in_query_arg) :
+  strict_type(FALSE),
   state(NO_VALUE),
   item_result_type(STRING_RESULT),
   /* Don't pretend to be a literal unless value for this item is set. */
@@ -2506,6 +2507,8 @@ bool Item_param::set_from_user_var(THD *
   if (entry && entry->value)
   {
     item_result_type= entry->type;
+    if (strict_type && required_result_type != item_result_type)
+      DBUG_RETURN(1);
     switch (entry->type) {
     case REAL_RESULT:
       set_double(*(double*)entry->value);

--- 1.229/sql/item.h	2007-05-18 12:08:11 +05:00
+++ 1.230/sql/item.h	2007-05-18 12:08:11 +05:00
@@ -1358,8 +1358,10 @@ class Item_param :public Item
   char cnvbuf[MAX_FIELD_WIDTH];
   String cnvstr;
   Item *cnvitem;
-public:
+  bool strict_type;
+  enum Item_result required_result_type;
 
+public:
   enum enum_item_param_state
   {
     NO_VALUE, NULL_VALUE, INT_VALUE, REAL_VALUE,
@@ -1487,6 +1489,11 @@ public:
     Otherwise return FALSE.
   */
   bool eq(const Item *item, bool binary_cmp) const;
+  void set_strict_type(enum Item_result result_type_arg)
+  {
+    strict_type= TRUE;
+    required_result_type= result_type_arg;
+  }
 };
 
 

--- 1.514/sql/sql_yacc.yy	2007-05-18 12:08:11 +05:00
+++ 1.515/sql/sql_yacc.yy	2007-05-18 12:08:11 +05:00
@@ -6216,6 +6216,9 @@ limit_options:
 	;
 limit_option:
         param_marker
+        {
+          ((Item_param *) $1)->set_strict_type(INT_RESULT);
+        }
         | ULONGLONG_NUM { $$= new Item_uint($1.str, $1.length); }
         | LONG_NUM     { $$= new Item_uint($1.str, $1.length); }
         | NUM           { $$= new Item_uint($1.str, $1.length); }

--- 1.11/mysql-test/r/limit.result	2007-05-18 12:08:11 +05:00
+++ 1.12/mysql-test/r/limit.result	2007-05-18 12:08:11 +05:00
@@ -91,3 +91,14 @@ select sum(a) c FROM t1 WHERE a > 0 ORDE
 c
 28
 drop table t1;
+prepare s from "select 1 limit ?";
+set @a='qwe';
+execute s using @a;
+ERROR HY000: Incorrect arguments to EXECUTE
+prepare s from "select 1 limit 1, ?";
+execute s using @a;
+ERROR HY000: Incorrect arguments to EXECUTE
+prepare s from "select 1 limit ?, ?";
+execute s using @a, @a;
+ERROR HY000: Incorrect arguments to EXECUTE
+End of 5.0 tests

--- 1.13/mysql-test/t/limit.test	2007-05-18 12:08:11 +05:00
+++ 1.14/mysql-test/t/limit.test	2007-05-18 12:08:11 +05:00
@@ -71,3 +71,20 @@ explain select sum(a) c FROM t1 WHERE a 
 select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
 drop table t1;
 # End of 4.1 tests
+
+#
+# Bug #28464: a string argument to 'limit ?' PS
+#
+
+prepare s from "select 1 limit ?"; 
+set @a='qwe'; 
+--error 1210
+execute s using @a;
+prepare s from "select 1 limit 1, ?";
+--error 1210
+execute s using @a;
+prepare s from "select 1 limit ?, ?";
+--error 1210
+execute s using @a, @a;
+
+--echo End of 5.0 tests