bzr push into mysql-6.0 branch (gshchepa:2712 to 2713) Bug#37997

[Gleb Shchepa]

 2713 Gleb Shchepa	2008-07-11
      minor testcase fix
modified:
  mysql-test/r/subselect_debug.result
  mysql-test/t/subselect_debug.test

 2712 Horst Hunger	2008-07-11 [merge]
      merge of fix of Bug#37997 to 6.0.
modified:
  mysql-test/r/max_user_connections_func.result
  mysql-test/t/max_user_connections_func.test

=== modified file 'mysql-test/r/subselect_debug.result'
--- a/mysql-test/r/subselect_debug.result	2008-07-07 08:43:56 +0000
+++ b/mysql-test/r/subselect_debug.result	2008-07-11 14:25:45 +0000
@@ -1,6 +1,7 @@
 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 @orig_debug = @@debug;
 SET SESSION debug="d,subselect_exec_fail";
 SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
 SUM(EXISTS(SELECT RAND() FROM t1))
@@ -8,5 +9,5 @@ SUM(EXISTS(SELECT RAND() FROM t1))
 SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
 REVERSE(EXISTS(SELECT RAND() FROM t1))
 0
-SET SESSION debug=DEFAULT;
+SET SESSION debug=@orig_debug;
 DROP TABLE t1;

=== modified file 'mysql-test/t/subselect_debug.test'
--- a/mysql-test/t/subselect_debug.test	2008-07-07 08:43:56 +0000
+++ b/mysql-test/t/subselect_debug.test	2008-07-11 14:25:45 +0000
@@ -9,8 +9,9 @@ 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 @orig_debug = @@debug;
 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;
+SET SESSION debug=@orig_debug;
 DROP TABLE t1;