List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:July 7 2008 9:03am
Subject:bzr push into mysql-6.0 branch (kgeorge:2697) Bug#37627
View as plain text  
 2697 Georgi Kodinov	2008-07-07 [merge]
      merge of the addendum fix for bug 37627 5.1-bugteam->6.0-bugteam
added:
  mysql-test/r/subselect_debug.result
  mysql-test/t/subselect_debug.test
modified:
  mysql-test/r/subselect.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/t/subselect.test

=== modified file 'mysql-test/r/subselect.result'
--- a/mysql-test/r/subselect.result	2008-07-04 15:09:45 +0000
+++ b/mysql-test/r/subselect.result	2008-07-07 09:01:22 +0000
@@ -4600,19 +4600,7 @@ INSERT INTO t1 VALUES (1), (3);
 SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 a	b
 DROP TABLE t1,t2;
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SUM(EXISTS(SELECT RAND() FROM t1))
-0
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-REVERSE(EXISTS(SELECT RAND() FROM t1))
-0
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+End of 5.0 tests.
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== added file 'mysql-test/r/subselect_debug.result'
--- a/mysql-test/r/subselect_debug.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/subselect_debug.result	2008-07-07 08:43:56 +0000
@@ -0,0 +1,12 @@
+CREATE TABLE t1(id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
+SET SESSION debug="d,subselect_exec_fail";
+SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
+SUM(EXISTS(SELECT RAND() FROM t1))
+0
+SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
+REVERSE(EXISTS(SELECT RAND() FROM t1))
+0
+SET SESSION debug=DEFAULT;
+DROP TABLE t1;

=== modified file 'mysql-test/r/subselect_no_mat.result'
--- a/mysql-test/r/subselect_no_mat.result	2008-07-04 15:09:45 +0000
+++ b/mysql-test/r/subselect_no_mat.result	2008-07-07 09:01:22 +0000
@@ -4604,19 +4604,7 @@ INSERT INTO t1 VALUES (1), (3);
 SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 a	b
 DROP TABLE t1,t2;
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SUM(EXISTS(SELECT RAND() FROM t1))
-0
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-REVERSE(EXISTS(SELECT RAND() FROM t1))
-0
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+End of 5.0 tests.
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/r/subselect_no_opts.result'
--- a/mysql-test/r/subselect_no_opts.result	2008-07-04 15:09:45 +0000
+++ b/mysql-test/r/subselect_no_opts.result	2008-07-07 09:01:22 +0000
@@ -4604,19 +4604,7 @@ INSERT INTO t1 VALUES (1), (3);
 SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 a	b
 DROP TABLE t1,t2;
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SUM(EXISTS(SELECT RAND() FROM t1))
-0
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-REVERSE(EXISTS(SELECT RAND() FROM t1))
-0
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+End of 5.0 tests.
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/r/subselect_no_semijoin.result'
--- a/mysql-test/r/subselect_no_semijoin.result	2008-07-04 15:09:45 +0000
+++ b/mysql-test/r/subselect_no_semijoin.result	2008-07-07 09:01:22 +0000
@@ -4604,19 +4604,7 @@ INSERT INTO t1 VALUES (1), (3);
 SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 a	b
 DROP TABLE t1,t2;
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SUM(EXISTS(SELECT RAND() FROM t1))
-0
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-REVERSE(EXISTS(SELECT RAND() FROM t1))
-0
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+End of 5.0 tests.
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/t/subselect.test'
--- a/mysql-test/t/subselect.test	2008-07-04 15:09:45 +0000
+++ b/mysql-test/t/subselect.test	2008-07-07 09:01:22 +0000
@@ -3443,21 +3443,7 @@ SELECT * FROM t2 WHERE b NOT IN (SELECT 
 
 DROP TABLE t1,t2;
 
-#
-# Bug #37627: Killing query with sum(exists()) or avg(exists()) reproducibly
-# crashes server
-#
-
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-# Setup the mysqld to crash at certain point
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+--echo End of 5.0 tests.
 
 #
 # Bug#33204: INTO is allowed in subselect, causing inconsistent results

=== added file 'mysql-test/t/subselect_debug.test'
--- a/mysql-test/t/subselect_debug.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subselect_debug.test	2008-07-07 08:43:56 +0000
@@ -0,0 +1,16 @@
+--source include/have_debug.inc
+
+#
+# Bug #37627: Killing query with sum(exists()) or avg(exists()) reproducibly
+# crashes server
+#
+
+CREATE TABLE t1(id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
+# Setup the mysqld to crash at certain point
+SET SESSION debug="d,subselect_exec_fail";
+SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
+SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
+SET SESSION debug=DEFAULT;
+DROP TABLE t1;
Thread
• bzr push into mysql-6.0 branch (kgeorge:2697) Bug#37627Georgi Kodinov7 Jul