database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed bug #643, which caused intermittent crashes in net_printf() with repeated

Browse Source 
syntax errors in stored procedures.


mysql-test/r/sp-error.result:
  New test case for bugfix (#643)
mysql-test/t/sp-error.test:
  New test case for bugfix (#643)
sql/sp_head.cc:
  Forgot to copy a slot from the original lex. (bug #643)
This commit is contained in:
unknown
2003-06-12 15:31:20 +02:00
parent 40f41ee1fc
commit e42120c664
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/sp-error.result
View File

@ -1,4 +1,10 @@
delete from mysql.proc; delete from mysql.proc;
create procedure syntaxerror(t int);
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
create procedure syntaxerror(t int);
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
create procedure syntaxerror(t int);
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
create procedure proc1() create procedure proc1()
set @x = 42; set @x = 42;
create function func1() returns int create function func1() returns int

10
mysql-test/t/sp-error.test
View File

@ -7,6 +7,16 @@ delete from mysql.proc;
delimiter |; delimiter |;
# This should give three syntax errors (sometimes crashed; bug #643)
# (Unfortunately, this is not a 100% test, on some platforms this
# passed despite the bug.)
--error 1064
create procedure syntaxerror(t int)|
--error 1064
create procedure syntaxerror(t int)|
--error 1064
create procedure syntaxerror(t int)|
# Check that we get the right error, i.e. UDF declaration parses correctly, # Check that we get the right error, i.e. UDF declaration parses correctly,
# but foo.so doesn't exist. # but foo.so doesn't exist.
# QQ This generates an error message containing a misleading errno which # QQ This generates an error message containing a misleading errno which

1
sql/sp_head.cc
View File

@ -376,6 +376,7 @@ sp_head::reset_lex(THD *thd)
/* We must reset ptr and end_of_query again */ /* We must reset ptr and end_of_query again */
sublex->ptr= m_lex->ptr; sublex->ptr= m_lex->ptr;
sublex->end_of_query= m_lex->end_of_query; sublex->end_of_query= m_lex->end_of_query;
sublex->tok_start= m_lex->tok_start;
/* And keep the SP stuff too */ /* And keep the SP stuff too */
sublex->sphead= m_lex->sphead; sublex->sphead= m_lex->sphead;
sublex->spcont= m_lex->spcont; sublex->spcont= m_lex->spcont;