MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Glukhov Date:March 26 2010 6:08am
Subject:bzr commit into mysql-pe branch (Sergey.Glukhov:4003)
View as plain text  
#At file:///home/gluh/MySQL/mysql-pe/ based on revid:svoj@stripped

 4003 Sergey Glukhov	2010-03-26 [merge]
      5.1-bugteam->mysql-pe merge
     @ mysql-test/r/func_str.result
        5.1-bugteam->mysql-pe merge
     @ mysql-test/t/func_str.test
        5.1-bugteam->mysql-pe merge
     @ sql/item_strfunc.h
        5.1-bugteam->mysql-pe merge

    modified:
      mysql-test/r/func_str.result
      mysql-test/t/func_str.test
      sql/item_strfunc.h
=== modified file 'mysql-test/r/func_str.result'
--- a/mysql-test/r/func_str.result	2010-03-01 19:02:51 +0000
+++ b/mysql-test/r/func_str.result	2010-03-26 06:06:53 +0000
@@ -2719,4 +2719,17 @@ format(123, 1, 'Non-existent-locale')
 123.0
 Warnings:
 Warning	1649	Unknown locale: 'Non-existent-locale'
+#
+# Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149
+#
+CREATE TABLE t1 (a LONGBLOB NOT NULL);
+INSERT INTO t1 VALUES (''),('');
+SELECT 1 FROM t1, t1 t2
+ORDER BY QUOTE(t1.a);
+1
+1
+1
+1
+1
+DROP TABLE t1;
 End of 5.4 tests

=== modified file 'mysql-test/t/func_str.test'
--- a/mysql-test/t/func_str.test	2010-02-15 08:09:44 +0000
+++ b/mysql-test/t/func_str.test	2010-03-26 06:06:53 +0000
@@ -1390,5 +1390,14 @@ DROP TABLE t1;
 
 SELECT format(123, 1, 'Non-existent-locale');
 
+--echo #
+--echo # Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149
+--echo #
+CREATE TABLE t1 (a LONGBLOB NOT NULL);
+INSERT INTO t1 VALUES (''),('');
+SELECT 1 FROM t1, t1 t2
+ORDER BY QUOTE(t1.a);
+DROP TABLE t1;
+
 --echo End of 5.4 tests
 

=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h	2010-03-23 09:14:15 +0000
+++ b/sql/item_strfunc.h	2010-03-26 06:06:53 +0000
@@ -733,8 +733,9 @@ public:
   String *val_str(String *);
   void fix_length_and_dec()
   {
+    ulonglong max_result_length= (ulonglong) args[0]->max_length * 2 + 2;
+    max_length= min(max_result_length, MAX_BLOB_WIDTH);
     collation.set(args[0]->collation);
-    max_length= args[0]->max_length * 2 + 2;
   }
 };
 


Attachment: [text/bzr-bundle] bzr/sergey.glukhov@sun.com-20100326060653-2vzy5u28r4zcw3bn.bundle
Thread
bzr commit into mysql-pe branch (Sergey.Glukhov:4003)Sergey Glukhov26 Mar