Merge mysql.com:/home/pz/mysql/mysql-4.1-root

into mysql.com:/home/pz/mysql/mysql-4.1

mysql-test/r/subselect.result

@@ -5,6 +5,9 @@ SELECT (SELECT 1) UNION SELECT (SELECT 2);
 (SELECT 1)
 1
 2
+SELECT (SELECT (SELECT 0 UNION SELECT 0));
+(SELECT (SELECT 0 UNION SELECT 0))
+0
 drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit;
 create table t1 (a int);
 create table t2 (a int, b int);

mysql-test/t/subselect.test

-
 select (select 2);
 SELECT (SELECT 1) UNION SELECT (SELECT 2);
+SELECT (SELECT (SELECT 0 UNION SELECT 0));
 drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit;
 create table t1 (a int);
 create table t2 (a int, b int);

sql/share/czech/errmsg.txt

@@ -251,3 +251,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/danish/errmsg.txt

@@ -245,3 +245,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/dutch/errmsg.txt

@@ -253,3 +253,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/estonian/errmsg.txt

@@ -247,3 +247,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/french/errmsg.txt

@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/german/errmsg.txt

@@ -245,3 +245,4 @@
 "Key reference and table reference doesn't match",
 "Subselect return more than 1 field",
 "Subselect return more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/greek/errmsg.txt

@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/hungarian/errmsg.txt

@@ -244,3 +244,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/italian/errmsg.txt

@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/japanese/errmsg.txt

@@ -244,3 +244,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/korean/errmsg.txt

@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/norwegian-ny/errmsg.txt

@@ -244,3 +244,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/norwegian/errmsg.txt

@@ -244,3 +244,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/polish/errmsg.txt

@@ -246,3 +246,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/portuguese/errmsg.txt

@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/romanian/errmsg.txt

@@ -246,3 +246,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/russian/errmsg.txt

@@ -245,3 +245,4 @@
 "Key reference and table reference doesn't match",
 "    ",
 "    ",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/serbian/errmsg.txt

@@ -238,3 +238,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/slovak/errmsg.txt

@@ -250,3 +250,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/spanish/errmsg.txt

@@ -243,3 +243,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/swedish/errmsg.txt

@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",

sql/share/ukrainian/errmsg.txt

@@ -247,3 +247,4 @@
 "Key reference and table reference doesn't match",
 "i  i i 1 ",
 "i  i i 1 ",
+"Unknown prepared statement handler (%ld) given to %s",

sql/sql_lex.cc

@@ -945,7 +945,7 @@ void st_select_lex_unit::init_query()
   select_limit_cnt= HA_POS_ERROR;
   offset_limit_cnt= 0;
   union_option= 0;
-  prepared= optimized= 0;
+  prepared= optimized= executed= 0;
   item= 0;
 }
 

sql/sql_lex.h

@@ -227,8 +227,9 @@ protected:
   select_result *result;
   int res;
   bool describe, found_rows_for_union,
-    prepared, //prepare phase already performed for UNION (unit)
-    optimized; // optimize phase already performed for UNION (unit)
+    prepared, // prepare phase already performed for UNION (unit)
+    optimized, // optimize phase already performed for UNION (unit)
+    executed; // already executed
 public:
   /*
     Pointer to 'last' select or pointer to unit where stored

sql/sql_union.cc

@@ -200,7 +200,11 @@ int st_select_lex_unit::exec()
   DBUG_ENTER("st_select_lex_unit::exec");
   SELECT_LEX *lex_select_save= thd->lex.select;
   
-  if(depended || !item || !item->assigned())
+  if (executed && !depended)
+    DBUG_RETURN(0);
+  executed= 1;
+  
+  if (depended || !item || !item->assigned())
   {
     if (optimized && item && item->assigned())
       item->assigned(0); // We will reinit & rexecute unit