Skip to content

M
MariaDB
Commit 758f7efc authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files
Options

fixed bad merge

parent f7f940fc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
sql/sql_parse.cc
View file @ 758f7efc
...@@ -1937,14 +1937,10 @@ mysql_execute_command(void) ...@@ -1937,14 +1937,10 @@ mysql_execute_command(void)
goto error; goto error;
// Set privilege for the WHERE clause // Set privilege for the WHERE clause
tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege); tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege);
/* TRUNCATE ends previous transaction */ res = mysql_delete(thd,tables, select_lex->where,
if (lex->sql_command == SQLCOM_TRUNCATE && end_active_trans(thd)) (ORDER*) select_lex->order_list.first,
res= -1; select_lex->select_limit, lex->lock_option,
else select_lex->options);
res = mysql_delete(thd,tables, select_lex->where,
(ORDER*) select_lex->order_list.first,
select_lex->select_limit, lex->lock_option,
select_lex->options);
break; break;
} }
case SQLCOM_DELETE_MULTI: case SQLCOM_DELETE_MULTI:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7