many bug fixes

mysql-test/r/derived.result:
  test for a bug fix which caused a deadlock !
  Also test for a bug fix with using() on derived tables
mysql-test/r/subselect.result:
  correcting previous changes caused by a bug ..
mysql-test/t/derived.test:
  test for a bug fix which caused a deadlock !
  Also test for a bug fix with using() on derived tables
mysql-test/t/subselect.test:
  corrections of previous changes caused by a bug ..
sql/sql_base.cc:
  A for for a bug which caused a deadlock !
  Also fix for a bug with using() on derived tables
sql/sql_derived.cc:
  code cleanup
sql/sql_lex.cc:
  fix for deadlock

1 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index e2f786554b1..16b3a071be8 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -17,14 +17,14 @@ SELECT (SELECT 1),MAX(1) FROM (SELECT 1) as a;
 1	1
 SELECT (SELECT a) as a;
 Reference 'a' not supported (forward reference in item list)
-EXPLAIN SELECT 1,a FROM (SELECT 1 as a) as b  HAVING (SELECT a)=1;
+EXPLAIN SELECT 1 FROM (SELECT 1 as a) as b  HAVING (SELECT a)=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	
 3	DEPENDENT SUBSELECT								No tables used
 2	DERIVED								No tables used
-SELECT 1,a FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
-1	a
-1	1
+SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
+1
+1
 SELECT (SELECT 1), a;
 Unknown column 'a' in 'field list'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
@@ -387,9 +387,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 drop table t1;
 CREATE TABLE t1 (a int(1));
 INSERT INTO t1 VALUES (1);
-SELECT 1,a FROM (SELECT a FROM t1) b HAVING (SELECT b.a)=1;
-1	a
-1	1
+SELECT 1 FROM (SELECT a FROM t1) b HAVING (SELECT b.a)=1;
+1
+1
 drop table t1;
 create table t1 (a int NOT NULL, b int, primary key (a));
 create table t2 (a int NOT NULL, b int, primary key (a));