Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d1132f0e
Commit
d1132f0e
authored
Oct 12, 2005
by
grog@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/grog/4.1
parents
c36cf6db
c248a36e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
mysql-test/r/subselect.result
mysql-test/r/subselect.result
+1
-0
mysql-test/t/subselect.test
mysql-test/t/subselect.test
+6
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+4
-1
No files found.
mysql-test/r/subselect.result
View file @
d1132f0e
...
...
@@ -2834,3 +2834,4 @@ a
3
4
DROP TABLE t1,t2,t3;
purge master logs before (select adddate(current_timestamp(), interval -4 day));
mysql-test/t/subselect.test
View file @
d1132f0e
...
...
@@ -1814,4 +1814,10 @@ SELECT * FROM t1
DROP
TABLE
t1
,
t2
,
t3
;
#
# BUG #10308: purge log with subselect
#
purge
master
logs
before
(
select
adddate
(
current_timestamp
(),
interval
-
4
day
));
# End of 4.1 tests
sql/sql_yacc.yy
View file @
d1132f0e
...
...
@@ -4715,7 +4715,10 @@ purge_option:
}
| BEFORE_SYM expr
{
if ($2->check_cols(1) || $2->fix_fields(Lex->thd, 0, &$2))
if (!$2)
/* Can only be an out of memory situation, no need for a message */
YYABORT;
if ($2->fix_fields(Lex->thd, 0, &$2) || $2->check_cols(1))
{
net_printf(Lex->thd, ER_WRONG_ARGUMENTS, "PURGE LOGS BEFORE");
YYABORT;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment