bzr push into mysql-trunk branch (Georgi.Kodinov:3817)

[Georgi Kodinov]

 3817 Georgi Kodinov	2012-03-21 [merge]
      merge

    removed:
      BUILD/FINISH.sh
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/check-cpu
      BUILD/cleanup
      BUILD/compile-alpha
      BUILD/compile-amd64-debug-max
      BUILD/compile-amd64-debug-max-no-ndb
      BUILD/compile-amd64-gcov
      BUILD/compile-amd64-gprof
      BUILD/compile-amd64-max
      BUILD/compile-amd64-max-sci
      BUILD/compile-amd64-valgrind-max
      BUILD/compile-hpux11-parisc2-aCC
      BUILD/compile-ia64-debug-max
      BUILD/compile-ndb-autotest
      BUILD/compile-pentium-cybozu
      BUILD/compile-pentium-debug-max-no-embedded
      BUILD/compile-pentium-debug-openssl
      BUILD/compile-pentium-debug-yassl
      BUILD/compile-pentium-max
      BUILD/compile-pentium-myodbc
      BUILD/compile-pentium64-debug
      BUILD/compile-pentium64-debug-max
      BUILD/compile-pentium64-gcov
      BUILD/compile-pentium64-gprof
      BUILD/compile-pentium64-max
      BUILD/compile-pentium64-max-sci
      BUILD/compile-pentium64-valgrind-max
      BUILD/compile-ppc
      BUILD/compile-ppc-debug
      BUILD/compile-ppc-debug-max
      BUILD/compile-ppc-debug-max-no-ndb
      BUILD/compile-ppc-max
      BUILD/compile-solaris-amd64
      BUILD/compile-solaris-amd64-debug
      BUILD/compile-solaris-amd64-forte
      BUILD/compile-solaris-amd64-forte-debug
      BUILD/compile-solaris-sparc
      BUILD/compile-solaris-sparc-debug
      BUILD/compile-solaris-sparc-forte
      BUILD/compile-solaris-sparc-purify
    added:
      cmake/build_configurations/compiler_options.cmake
      cmake/build_configurations/feature_set.cmake
    modified:
      BUILD/compile-dist
      BUILD/compile-pentium
      BUILD/compile-pentium-debug
      BUILD/compile-pentium-debug-max
      BUILD/compile-pentium-debug-max-no-ndb
      BUILD/compile-pentium-gcov
      BUILD/compile-pentium-gprof
      BUILD/compile-pentium-valgrind-max
      BUILD/compile-pentium-valgrind-max-no-ndb
      BUILD/compile-pentium64
      CMakeLists.txt
      cmake/build_configurations/mysql_release.cmake
      cmake/package_name.cmake
      storage/ndb/CMakeLists.txt
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-03-06 14:29:42 +0000
+++ b/mysql-test/collections/default.experimental	2012-03-21 14:27:34 +0000
@@ -22,6 +22,7 @@ rpl.rpl_innodb_bug28430                 
 rpl.rpl_row_sp011  @solaris              # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_seconds_behind_master            # BUG#11765124 2010-11-24 luis fails sporadically on pb2
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
+rpl.rpl_parallel_switch_sequential       # BUG#13626976 2012-02-07 dlenev Fails sporadically on pb2
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 

=== modified file 'mysql-test/r/join_outer.result'
--- a/mysql-test/r/join_outer.result	2012-03-21 06:42:54 +0000
+++ b/mysql-test/r/join_outer.result	2012-03-21 14:27:34 +0000
@@ -1644,6 +1644,28 @@ NULL
 NULL
 NULL
 DROP TABLE h,m,k;
+#
+# Bug #11765810	58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BY
+# IS EXECUTED TWICE FROM P
+#
+CREATE TABLE t1 ( a INT ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1);
+PREPARE prep_stmt FROM '
+ SELECT 1 AS f FROM t1
+ LEFT JOIN t1 t2
+  RIGHT JOIN t1 t3
+    JOIN t1 t4
+   ON 1
+  ON 1
+ ON 1
+ GROUP BY f';
+EXECUTE prep_stmt;
+f
+1
+EXECUTE prep_stmt;
+f
+1
+DROP TABLE t1;
 End of 5.1 tests
 #
 # Bug#54235 Extra rows with join_cache_level=4,6,8 and two LEFT JOIN

=== modified file 'mysql-test/r/join_outer_bka.result'
--- a/mysql-test/r/join_outer_bka.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/join_outer_bka.result	2012-03-21 14:27:34 +0000
@@ -1645,6 +1645,28 @@ NULL
 NULL
 NULL
 DROP TABLE h,m,k;
+#
+# Bug #11765810	58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BY
+# IS EXECUTED TWICE FROM P
+#
+CREATE TABLE t1 ( a INT ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1);
+PREPARE prep_stmt FROM '
+ SELECT 1 AS f FROM t1
+ LEFT JOIN t1 t2
+  RIGHT JOIN t1 t3
+    JOIN t1 t4
+   ON 1
+  ON 1
+ ON 1
+ GROUP BY f';
+EXECUTE prep_stmt;
+f
+1
+EXECUTE prep_stmt;
+f
+1
+DROP TABLE t1;
 End of 5.1 tests
 #
 # Bug#54235 Extra rows with join_cache_level=4,6,8 and two LEFT JOIN

=== modified file 'mysql-test/r/join_outer_bka_nixbnl.result'
--- a/mysql-test/r/join_outer_bka_nixbnl.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/join_outer_bka_nixbnl.result	2012-03-21 14:27:34 +0000
@@ -1645,6 +1645,28 @@ NULL
 NULL
 NULL
 DROP TABLE h,m,k;
+#
+# Bug #11765810	58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BY
+# IS EXECUTED TWICE FROM P
+#
+CREATE TABLE t1 ( a INT ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1);
+PREPARE prep_stmt FROM '
+ SELECT 1 AS f FROM t1
+ LEFT JOIN t1 t2
+  RIGHT JOIN t1 t3
+    JOIN t1 t4
+   ON 1
+  ON 1
+ ON 1
+ GROUP BY f';
+EXECUTE prep_stmt;
+f
+1
+EXECUTE prep_stmt;
+f
+1
+DROP TABLE t1;
 End of 5.1 tests
 #
 # Bug#54235 Extra rows with join_cache_level=4,6,8 and two LEFT JOIN

=== modified file 'mysql-test/t/join_outer.test'
--- a/mysql-test/t/join_outer.test	2012-03-21 06:42:54 +0000
+++ b/mysql-test/t/join_outer.test	2012-03-21 14:27:34 +0000
@@ -1238,6 +1238,27 @@ WHERE TABLE1.pk IS NULL;
 
 DROP TABLE h,m,k;
 
+--echo #
+--echo # Bug #11765810	58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BY
+--echo # IS EXECUTED TWICE FROM P
+--echo #
+CREATE TABLE t1 ( a INT ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1);
+PREPARE prep_stmt FROM '
+ SELECT 1 AS f FROM t1
+ LEFT JOIN t1 t2
+  RIGHT JOIN t1 t3
+    JOIN t1 t4
+   ON 1
+  ON 1
+ ON 1
+ GROUP BY f';
+EXECUTE prep_stmt;
+EXECUTE prep_stmt;
+
+DROP TABLE t1;
+
+
 --echo End of 5.1 tests
 
 --echo #

No bundle (reason: useless for push emails).