bzr push into mysql-trunk branch (Georgi.Kodinov:3389 to 3391)

[Georgi Kodinov]

 3391 Georgi Kodinov	2011-05-10 [merge]
      merge mysql-5.5->mysql-trunk

 3390 Georgi Kodinov	2011-05-10 [merge]
      weave-merge of mysql-5.5->mysql-trunk

    modified:
      mysql-test/r/explain.result
      mysql-test/t/explain.test
 3389 Jon Olav Hauglid	2011-05-10
      Bug#11747690 (former 33650)
      MYSQL_ALTER_TABLE() UNNECESSARILY DOES FULL TABLE COPY
      
      The problem was that full table copy was done when creating an
      index on a UTF-8 VARCHAR column (rather than using in-place
      ALTER TABLE).
      
      This problem is not repeatable using InnoDB. It is repeatable
      using MyISAM, but MyISAM does not support in-place add index in
      general, not just for UTF-8 VARCHAR columns. Therefore the current
      behavior is not a bug with regards to MyISAM.
      
      This patch adds a regression test for InnoDB and contains no
      code changes.

    modified:
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/t/innodb_mysql_lock.test
=== modified file 'mysql-test/r/explain.result'
--- a/mysql-test/r/explain.result	2011-05-06 12:49:37 +0000
+++ b/mysql-test/r/explain.result	2011-05-10 13:37:37 +0000
@@ -443,4 +443,17 @@ Note	1003	select `test`.`t1`.`url` AS `u
 
 DROP TABLE t1;
 # End BUG#53562
+#
+# Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIES
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (0), (0);
+PREPARE s FROM 
+'EXPLAIN EXTENDED
+SELECT SUBSTRING(1, (SELECT 1 FROM t1 a1 RIGHT OUTER JOIN t1 ON 0)) AS d
+FROM t1 WHERE 0 > ANY (SELECT @a FROM t1)';
+EXECUTE s;
+ERROR 21000: Subquery returns more than 1 row
+DEALLOCATE PREPARE s;
+DROP TABLE t1;
 End of 6.0 tests.

=== modified file 'mysql-test/t/explain.test'
--- a/mysql-test/t/explain.test	2011-05-06 12:49:37 +0000
+++ b/mysql-test/t/explain.test	2011-05-10 13:37:37 +0000
@@ -354,4 +354,23 @@ DROP TABLE t1;
 
 --echo # End BUG#53562
 
+--echo #
+--echo # Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIES
+--echo #
+
+CREATE TABLE t1(a INT);
+
+INSERT INTO t1 VALUES (0), (0);
+
+PREPARE s FROM 
+'EXPLAIN EXTENDED
+SELECT SUBSTRING(1, (SELECT 1 FROM t1 a1 RIGHT OUTER JOIN t1 ON 0)) AS d
+FROM t1 WHERE 0 > ANY (SELECT @a FROM t1)';
+
+--error ER_SUBQUERY_NO_1_ROW
+EXECUTE s;
+
+DEALLOCATE PREPARE s;
+DROP TABLE t1;
+
 --echo End of 6.0 tests.

No bundle (reason: useless for push emails).