From: Sergey Glukhov
Date: December 14 2010 4:30pm
Subject: bzr push into mysql-5.5-bugteam branch (sergey.glukhov:3191 to 3192)
List-Archive: http://lists.mysql.com/commits/126810
Message-Id: <201012141640.oBEGeUEV029649@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3192 Sergey Glukhov	2010-12-14 [merge]
      5.1-bugteam->5.5-bugteam merge(test case only)
     @ mysql-test/r/func_str.result
        5.1-bugteam->5.5-bugteam merge(test case only)
     @ mysql-test/t/func_str.test
        5.1-bugteam->5.5-bugteam merge(test case only)

    modified:
      mysql-test/r/func_str.result
      mysql-test/t/func_str.test
 3191 Georgi Kodinov	2010-12-08
      Bug #58350: 5.5.7-rc compile failed at sp_head.cc
      
      Fixed the references to security_ctx->priv_user
      to be real char * pointers instead of a C array name reference.
      This is somehow important for some 3d party 
      dtrace replacements

    modified:
      sql/sp_head.cc
      sql/sql_connect.cc
      sql/sql_cursor.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
=== modified file 'mysql-test/r/func_str.result'
--- a/mysql-test/r/func_str.result	2010-08-20 11:14:11 +0000
+++ b/mysql-test/r/func_str.result	2010-12-14 16:26:18 +0000
@@ -2603,6 +2603,18 @@ ORDER BY QUOTE(t1.a);
 1
 1
 DROP TABLE t1;
+#
+# Bug#57913 large negative number to string conversion functions crash
+# Bug#57810 case/when/then : Assertion failed: length || !scale
+#
+SELECT '1' IN ('1', SUBSTRING(-9223372036854775809, 1));
+'1' IN ('1', SUBSTRING(-9223372036854775809, 1))
+1
+SELECT CONVERT(('' IN (REVERSE(CAST(('') AS DECIMAL)), '')), CHAR(3));
+CONVERT(('' IN (REVERSE(CAST(('') AS DECIMAL)), '')), CHAR(3))
+1
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: ''
 End of 5.1 tests
 Start of 5.4 tests
 SELECT format(12345678901234567890.123, 3);

=== modified file 'mysql-test/t/func_str.test'
--- a/mysql-test/t/func_str.test	2010-08-20 11:14:11 +0000
+++ b/mysql-test/t/func_str.test	2010-12-14 16:26:18 +0000
@@ -1363,6 +1363,13 @@ SELECT 1 FROM t1, t1 t2
 ORDER BY QUOTE(t1.a);
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#57913 large negative number to string conversion functions crash
+--echo # Bug#57810 case/when/then : Assertion failed: length || !scale
+--echo #
+SELECT '1' IN ('1', SUBSTRING(-9223372036854775809, 1));
+SELECT CONVERT(('' IN (REVERSE(CAST(('') AS DECIMAL)), '')), CHAR(3));
+
 --echo End of 5.1 tests
 
 --echo Start of 5.4 tests

No bundle (reason: useless for push emails).