1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bad merge

Browse Source
This commit is contained in:
unknown 2002-09-02 20:37:18 +00:00
parent 2c121b068c
commit 46405eaff8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@ -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: