Commit 0f9f2b02 authored by unknown's avatar unknown
Browse files

A fix (bug #6449: DO server-crashing bug). 


sql/sql_yacc.yy:
  A fix (bug #6449: DO server-crashing bug).
  expr_list is used for DO command.
parent a2b3d71d

mysql-test/r/select.result

+4 −0
Original line number Diff line number Diff line
@@ -2057,6 +2057,10 @@ t2 1 fld3 1 fld3 A NULL NULL NULL BTREE 
drop table t4, t3, t2, t1;

DO 1;

DO benchmark(100,1+1),1,1;

do default;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

do foobar;

ERROR 42S22: Unknown column 'foobar' in 'field list'

CREATE TABLE t1 (

id mediumint(8) unsigned NOT NULL auto_increment,

pseudo varchar(35) NOT NULL default '',

mysql-test/t/select.test

+9 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,15 @@ drop table t4, t3, t2, t1; 
DO 1;

DO benchmark(100,1+1),1,1;



#

# Bug #6449: do default;

#



--error 1064

do default;

--error 1054

do foobar;



#

# random in WHERE clause

#

sql/sql_yacc.yy

+5 −4
Original line number Diff line number Diff line
@@ -3932,11 +3932,12 @@ do: DO_SYM 
	{

	  LEX *lex=Lex;

	  lex->sql_command = SQLCOM_DO;

	  if (!(lex->insert_list = new List_item))

	    YYABORT;

	  mysql_init_select(lex);

	}

	expr_list

	{

	  Lex->insert_list= $3;

	}

	values

	{}

	;



/*