bk commit into 5.0 tree (davi:1.2570) BUG#33798

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.0 repository of davi.  When davi 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, 2008-02-08 08:55:55-02:00, davi@stripped +5 -0
  Bug#33798 prepared statements improperly handle large unsigned ints
  
  The unsignedness of large integer user variables was not being
  properly preserved when feeded to prepared statements. This was
  happening because the unsigned flags wasn't being updated when
  converting the user variable is converted to a parameter.
  
  The solution is to copy the unsigned flag when converting the
  user variable to a parameter and take the unsigned flag into
  account when converting the integer to a string.

  mysql-test/r/binlog.result@stripped, 2008-02-08 08:55:53-02:00, davi@stripped +15 -0
    Add test case result for Bug#33798

  mysql-test/r/ps.result@stripped, 2008-02-08 08:55:53-02:00, davi@stripped +16 -0
    Add test case result for Bug#33798

  mysql-test/t/binlog.test@stripped, 2008-02-08 08:55:53-02:00, davi@stripped +17 -0
    Add test case for Bug#33798

  mysql-test/t/ps.test@stripped, 2008-02-08 08:55:53-02:00, davi@stripped +17 -0
    Add test case for Bug#33798

  sql/item.cc@stripped, 2008-02-08 08:55:54-02:00, davi@stripped +5 -1
    Take the unsigned flag into account when converting the
    user variable.

diff -Nrup a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result
--- a/mysql-test/r/binlog.result	2007-07-09 03:11:36 -03:00
+++ b/mysql-test/r/binlog.result	2008-02-08 08:55:53 -02:00
@@ -567,4 +567,19 @@ master-bin.000001	36585	Rotate	1	36629	m
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
+drop table if exists t1;
+reset master;
+create table t1 (a bigint unsigned, b bigint(20) unsigned);
+prepare stmt from "insert into t1 values (?,?)";
+set @a= 9999999999999999;
+set @b= 14632475938453979136;
+execute stmt using @a, @b;
+deallocate prepare stmt;
+drop table t1;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	98	Server version, Binlog ver: 4
+master-bin.000001	98	Query	1	219	use `test`; create table t1 (a bigint unsigned, b
bigint(20) unsigned)
+master-bin.000001	219	Query	1	343	use `test`; insert into t1 values
(9999999999999999,14632475938453979136)
+master-bin.000001	343	Query	1	419	use `test`; drop table t1
 End of 5.0 tests
diff -Nrup a/mysql-test/r/ps.result b/mysql-test/r/ps.result
--- a/mysql-test/r/ps.result	2007-12-13 08:49:11 -02:00
+++ b/mysql-test/r/ps.result	2008-02-08 08:55:53 -02:00
@@ -1693,4 +1693,20 @@ t1	CREATE TABLE `t1` (
   `?` decimal(2,1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+drop table if exists t1;
+create table t1 (a bigint unsigned, b bigint(20) unsigned);
+prepare stmt from "insert into t1 values (?,?)";
+set @a= 9999999999999999;
+set @b= 14632475938453979136;
+insert into t1 values (@a, @b);
+select * from t1 where a = @a and b = @b;
+a	b
+9999999999999999	14632475938453979136
+execute stmt using @a, @b;
+select * from t1 where a = @a and b = @b;
+a	b
+9999999999999999	14632475938453979136
+9999999999999999	14632475938453979136
+deallocate prepare stmt;
+drop table t1;
 End of 5.0 tests.
diff -Nrup a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test
--- a/mysql-test/t/binlog.test	2007-07-09 03:11:36 -03:00
+++ b/mysql-test/t/binlog.test	2008-02-08 08:55:53 -02:00
@@ -106,4 +106,21 @@ drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
 
+#
+# Bug#33798: prepared statements improperly handle large unsigned ints
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+reset master;
+create table t1 (a bigint unsigned, b bigint(20) unsigned);
+prepare stmt from "insert into t1 values (?,?)";
+set @a= 9999999999999999;
+set @b= 14632475938453979136;
+execute stmt using @a, @b;
+deallocate prepare stmt;
+drop table t1;
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server
ver: [^,]*,/Server version,/
+show binlog events from 0;
+
 --echo End of 5.0 tests
diff -Nrup a/mysql-test/t/ps.test b/mysql-test/t/ps.test
--- a/mysql-test/t/ps.test	2007-11-10 12:27:56 -02:00
+++ b/mysql-test/t/ps.test	2008-02-08 08:55:53 -02:00
@@ -1807,4 +1807,21 @@ execute stmt using @a;
 show create table t1;
 drop table t1;
 
+#
+# Bug#33798: prepared statements improperly handle large unsigned ints
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (a bigint unsigned, b bigint(20) unsigned);
+prepare stmt from "insert into t1 values (?,?)";
+set @a= 9999999999999999;
+set @b= 14632475938453979136;
+insert into t1 values (@a, @b);
+select * from t1 where a = @a and b = @b;
+execute stmt using @a, @b;
+select * from t1 where a = @a and b = @b;
+deallocate prepare stmt;
+drop table t1;
+
 --echo End of 5.0 tests.
diff -Nrup a/sql/item.cc b/sql/item.cc
--- a/sql/item.cc	2008-01-11 15:57:33 -02:00
+++ b/sql/item.cc	2008-02-08 08:55:54 -02:00
@@ -2580,6 +2580,7 @@ bool Item_param::set_from_user_var(THD *
   if (entry && entry->value)
   {
     item_result_type= entry->type;
+    unsigned_flag= entry->unsigned_flag;
     if (strict_type && required_result_type != item_result_type)
       DBUG_RETURN(1);
     switch (item_result_type) {
@@ -2875,7 +2876,10 @@ const String *Item_param::query_val_str(
 {
   switch (state) {
   case INT_VALUE:
-    str->set(value.integer, &my_charset_bin);
+    if (unsigned_flag)
+      str->set((ulonglong) value.integer, &my_charset_bin);
+    else
+      str->set(value.integer, &my_charset_bin);
     break;
   case REAL_VALUE:
     str->set(value.real, NOT_FIXED_DEC, &my_charset_bin);