mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build

Browse source 
into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown 2006-11-29 14:26:47 +01:00
commit 412d284e06
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/mysql-test-run.pl
View file

@ -63,7 +63,6 @@ use Getopt::Long;
use Sys::Hostname; use Sys::Hostname;
use IO::Socket; use IO::Socket;
use IO::Socket::INET; use IO::Socket::INET;
use Data::Dumper;
use strict; use strict;
use warnings; use warnings;

18
sql/sql_parse.cc
View file

@ -3968,6 +3968,7 @@ end_with_restore_list:
} }
case SQLCOM_CREATE_EVENT: case SQLCOM_CREATE_EVENT:
case SQLCOM_ALTER_EVENT: case SQLCOM_ALTER_EVENT:
do
{ {
DBUG_ASSERT(lex->event_parse_data); DBUG_ASSERT(lex->event_parse_data);
if (lex->table_or_sp_used()) if (lex->table_or_sp_used())
@ -3993,16 +3994,15 @@ end_with_restore_list:
if (!res) if (!res)
send_ok(thd); send_ok(thd);
/* Don't do it, if we are inside a SP */ } while (0);
if (!thd->spcont) /* Don't do it, if we are inside a SP */
{ if (!thd->spcont)
delete lex->sphead; {
lex->sphead= NULL; delete lex->sphead;
} lex->sphead= NULL;
/* lex->unit.cleanup() is called outside, no need to call it here */
break;
} }
/* lex->unit.cleanup() is called outside, no need to call it here */
break;
case SQLCOM_DROP_EVENT: case SQLCOM_DROP_EVENT:
case SQLCOM_SHOW_CREATE_EVENT: case SQLCOM_SHOW_CREATE_EVENT:
{ {