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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c0a741f0
Commit
c0a741f0
authored
Oct 15, 2013
by
Sergey Petrunya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix buildbot failures:
- MYSQL_MULTI_DELETE_DONE probe compile failure - show_explain_non_select.test
parent
7be365ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
mysql-test/t/show_explain_non_select.test
mysql-test/t/show_explain_non_select.test
+3
-3
sql/sql_parse.cc
sql/sql_parse.cc
+2
-2
No files found.
mysql-test/t/show_explain_non_select.test
View file @
c0a741f0
#
# SHOW EXPLAIN tests for non-select subqueries
#
#
--source include/have_debug.inc
#
--source include/have_innodb.inc
#
--source include/not_embedded.inc
--
source
include
/
have_debug
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
not_embedded
.
inc
--
disable_warnings
drop
table
if
exists
t0
,
t1
;
...
...
sql/sql_parse.cc
View file @
c0a741f0
...
...
@@ -3288,7 +3288,7 @@ end_with_restore_list:
DBUG_ASSERT
(
first_table
==
all_tables
&&
first_table
!=
0
);
TABLE_LIST
*
aux_tables
=
thd
->
lex
->
auxiliary_table_list
.
first
;
bool
explain
=
test
(
lex
->
describe
);
select_result
*
result
;
multi_delete
*
result
;
if
((
res
=
multi_delete_precheck
(
thd
,
all_tables
)))
break
;
...
...
@@ -3328,7 +3328,7 @@ end_with_restore_list:
result
,
unit
,
select_lex
);
res
|=
thd
->
is_error
();
MYSQL_MULTI_DELETE_DONE
(
res
,
del_
result
->
num_deleted
());
MYSQL_MULTI_DELETE_DONE
(
res
,
result
->
num_deleted
());
if
(
res
)
result
->
abort_result_set
();
/* for both DELETE and EXPLAIN DELETE */
else
...
...
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