bk commit into 5.0 tree (kroki:1.2116) BUG#15463

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2116 06/05/03 10:43:38 kroki@stripped +1 -0
  Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)
  
  Do not abort parsing of DESCRIBE statements even if there is no
  lex->result allocated, because that is intentional.
  
  No test case is provided because there is no way to detect client
  hanging in the current test framework.

  sql/sql_yacc.yy
    1.467 06/05/03 10:43:29 kroki@stripped +5 -2
    Result structure is not allocated for DESCRIBE statements, so do not abort
    parsing if there is no lex->result but we are in describe mode.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-bug15463

--- 1.466/sql/sql_yacc.yy	2006-04-23 08:11:24 +04:00
+++ 1.467/sql/sql_yacc.yy	2006-05-03 10:43:29 +04:00
@@ -5794,7 +5794,7 @@
              LEX *lex=Lex;
 	     if (lex->result) 
 	       ((select_dumpvar *)lex->result)->var_list.push_back( new my_var($2,0,0,(enum_field_types)0));
-	     else
+	     else if (!lex->describe)
 	       YYABORT;
 	   }
            | ident_or_text
@@ -5808,7 +5808,10 @@
 	       YYABORT;
 	     }
 	     if (! lex->result)
-	       YYABORT;
+             {
+               if (!lex->describe)
+                 YYABORT;
+             }
 	     else
 	     {
                my_var *var;