From 46405eaff8281d4e1abeb69d7d147e7227a0a1fb Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Sep 2002 20:37:18 +0000 Subject: [PATCH] fixed bad merge --- sql/sql_parse.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e38a3a5d340..9dab8df9bea 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1937,14 +1937,10 @@ mysql_execute_command(void) goto error; // Set privilege for the WHERE clause tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege); - /* TRUNCATE ends previous transaction */ - if (lex->sql_command == SQLCOM_TRUNCATE && end_active_trans(thd)) - res= -1; - else - res = mysql_delete(thd,tables, select_lex->where, - (ORDER*) select_lex->order_list.first, - select_lex->select_limit, lex->lock_option, - 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; } case SQLCOM_DELETE_MULTI: