mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge trift2.:/MySQL/M41/mysql-4.1

Browse source 
into  trift2.:/MySQL/M41/push-4.1
This commit is contained in:
joerg@trift2. 2007-06-14 21:27:33 +02:00
commit b5c9cab55c
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/subselect.result
View file

@ -2834,6 +2834,8 @@ a
4 4
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
purge master logs before (select adddate(current_timestamp(), interval -4 day)); purge master logs before (select adddate(current_timestamp(), interval -4 day));
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 'select adddate(current_timestamp(), interval -4 day))' at line 1
purge master logs before adddate(current_timestamp(), interval -4 day);
CREATE TABLE t1 (f1 INT); CREATE TABLE t1 (f1 INT);
CREATE TABLE t2 (f2 INT); CREATE TABLE t2 (f2 INT);
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);

5
mysql-test/t/subselect.test
View file

@ -1816,10 +1816,11 @@ DROP TABLE t1,t2,t3;
# #
# BUG#10308: purge log with subselect # BUG#10308: purge log with subselect
# Bug#28553: mysqld crash in "purge master log before(select time from information_schema)"
# #
--error 1064
purge master logs before (select adddate(current_timestamp(), interval -4 day)); purge master logs before (select adddate(current_timestamp(), interval -4 day));
purge master logs before adddate(current_timestamp(), interval -4 day);
# #
# Bug#18503: Queries with a quantified subquery returning empty set may # Bug#18503: Queries with a quantified subquery returning empty set may

8
sql/sql_yacc.yy
View file

@ -3567,7 +3567,8 @@ select_derived2:
LEX *lex= Lex; LEX *lex= Lex;
lex->derived_tables= 1; lex->derived_tables= 1;
if (lex->sql_command == (int)SQLCOM_HA_READ || if (lex->sql_command == (int)SQLCOM_HA_READ ||
lex->sql_command == (int)SQLCOM_KILL) lex->sql_command == (int)SQLCOM_KILL ||
lex->sql_command == (int)SQLCOM_PURGE)
{ {
yyerror(ER(ER_SYNTAX_ERROR)); yyerror(ER(ER_SYNTAX_ERROR));
YYABORT; YYABORT;
@ -4748,6 +4749,7 @@ purge:
{ {
LEX *lex=Lex; LEX *lex=Lex;
lex->type=0; lex->type=0;
lex->sql_command = SQLCOM_PURGE;
} purge_options } purge_options
{} {}
; ;
@ -4759,7 +4761,6 @@ purge_options:
purge_option: purge_option:
TO_SYM TEXT_STRING_sys TO_SYM TEXT_STRING_sys
{ {
Lex->sql_command = SQLCOM_PURGE;
Lex->to_log = $2.str; Lex->to_log = $2.str;
} }
| BEFORE_SYM expr | BEFORE_SYM expr
@ -6212,7 +6213,8 @@ subselect_start:
{ {
LEX *lex=Lex; LEX *lex=Lex;
if (lex->sql_command == (int)SQLCOM_HA_READ || if (lex->sql_command == (int)SQLCOM_HA_READ ||
lex->sql_command == (int)SQLCOM_KILL) lex->sql_command == (int)SQLCOM_KILL ||
lex->sql_command == (int)SQLCOM_PURGE)
{ {
yyerror(ER(ER_SYNTAX_ERROR)); yyerror(ER(ER_SYNTAX_ERROR));
YYABORT; YYABORT;