Commit f3ff1aeb authored by Marc Alff's avatar Marc Alff
Browse files

Bug#26030 (Parsing fails for stored routine w/multi-statement execution 

enabled)

Before this fix, the lexer and parser would treat the ';' character as a
different token (either ';' or END_OF_INPUT), based on convoluted logic,
which failed in simple cases where a stored procedure is implemented as a
single statement, and used in a multi query.

With this fix:
- the character ';' is always parsed as a ';' token in the lexer,
- parsing multi queries is implemented in the parser, in the 'query:' rules,
- the value of thd->client_capabilities, which is the capabilities
  negotiated between the client and the server during bootstrap,
  is immutable and not arbitrarily modified during parsing (which was the
  root cause of the bug)
parent bbdcf6ca

mysql-test/r/comments.result

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;";

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

prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;*";

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

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

prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';";

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 '/*!98765' AND b = 'bar'' at line 1

prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';*";

mysql-test/r/parser.result

0 → 100644
+68 −0
Original line number Diff line number Diff line 
DROP PROCEDURE IF EXISTS p26030;

select "non terminated"$$

non terminated

non terminated

select "terminated";$$

terminated

terminated

select "non terminated, space"      $$

non terminated, space

non terminated, space

select "terminated, space";      $$

terminated, space

terminated, space

select "non terminated, comment" /* comment */$$

non terminated, comment

non terminated, comment

select "terminated, comment"; /* comment */$$

terminated, comment

terminated, comment

select "stmt 1";select "stmt 2 non terminated"$$

stmt 1

stmt 1

stmt 2 non terminated

stmt 2 non terminated

select "stmt 1";select "stmt 2 terminated";$$

stmt 1

stmt 1

stmt 2 terminated

stmt 2 terminated

select "stmt 1";select "stmt 2 non terminated, space"      $$

stmt 1

stmt 1

stmt 2 non terminated, space

stmt 2 non terminated, space

select "stmt 1";select "stmt 2 terminated, space";      $$

stmt 1

stmt 1

stmt 2 terminated, space

stmt 2 terminated, space

select "stmt 1";select "stmt 2 non terminated, comment" /* comment */$$

stmt 1

stmt 1

stmt 2 non terminated, comment

stmt 2 non terminated, comment

select "stmt 1";select "stmt 2 terminated, comment"; /* comment */$$

stmt 1

stmt 1

stmt 2 terminated, comment

stmt 2 terminated, comment

select "stmt 1";             select "space, stmt 2"$$

stmt 1

stmt 1

space, stmt 2

space, stmt 2

select "stmt 1";/* comment */select "comment, stmt 2"$$

stmt 1

stmt 1

comment, stmt 2

comment, stmt 2

DROP PROCEDURE IF EXISTS p26030; CREATE PROCEDURE p26030() BEGIN SELECT 1; END; CALL p26030()

$$

1

1

DROP PROCEDURE IF EXISTS p26030; CREATE PROCEDURE p26030() SELECT 1; CALL p26030()

$$

1

1

DROP PROCEDURE p26030;

mysql-test/r/ps.result

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ NULL 
NULL

NULL

prepare stmt6 from 'select 1; select2';

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 '; select2' at line 1

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 'select2' at line 1

prepare stmt6 from 'insert into t1 values (5,"five"); select2';

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 '; select2' at line 1

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 'select2' at line 1

explain prepare stmt6 from 'insert into t1 values (5,"five"); select2';

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 'from 'insert into t1 values (5,"five"); select2'' at line 1

create table t2

mysql-test/t/parser.test

0 → 100644
+59 −0
Original line number Diff line number Diff line 
#

# This file contains tests covering the parser

#



#=============================================================================

# LEXICAL PARSER (lex)

#=============================================================================



#

# Maintainer: these tests are for the lexical parser, so every character,

# even whitespace or comments, is significant here.

#



#

# Bug#26030 (Parsing fails for stored routine w/multi-statement execution

# enabled)

#



--disable_warnings

DROP PROCEDURE IF EXISTS p26030;

--enable_warnings



delimiter $$;



select "non terminated"$$

select "terminated";$$

select "non terminated, space"      $$

select "terminated, space";      $$

select "non terminated, comment" /* comment */$$

select "terminated, comment"; /* comment */$$



# Multi queries can not be used in --ps-protocol test mode

--disable_ps_protocol



select "stmt 1";select "stmt 2 non terminated"$$

select "stmt 1";select "stmt 2 terminated";$$

select "stmt 1";select "stmt 2 non terminated, space"      $$

select "stmt 1";select "stmt 2 terminated, space";      $$

select "stmt 1";select "stmt 2 non terminated, comment" /* comment */$$

select "stmt 1";select "stmt 2 terminated, comment"; /* comment */$$



select "stmt 1";             select "space, stmt 2"$$

select "stmt 1";/* comment */select "comment, stmt 2"$$



DROP PROCEDURE IF EXISTS p26030; CREATE PROCEDURE p26030() BEGIN SELECT 1; END; CALL p26030()

$$



DROP PROCEDURE IF EXISTS p26030; CREATE PROCEDURE p26030() SELECT 1; CALL p26030()

$$



--enable_ps_protocol



delimiter ;$$

DROP PROCEDURE p26030;



#============================================================================r

# SYNTACTIC PARSER (bison)

#=============================================================================

sql/sp_head.h

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ class sp_head :private Query_arena 
  create_field m_return_field_def; /* This is used for FUNCTIONs only. */



  const char *m_tmp_query;	// Temporary pointer to sub query string

  uint m_old_cmq;		// Old CLIENT_MULTI_QUERIES value

  st_sp_chistics *m_chistics;

  ulong m_sql_mode;		// For SHOW CREATE and execution

  LEX_STRING m_qname;		// db.name