fixed bad merge

e21bcbe3 · unknown · 6bcfd037 · e21bcbe3
Commit e21bcbe3 authored Sep 02, 2002 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

sql/sql_parse.cc sql/sql_parse.cc +4 -8

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1937,10 +1937,6 @@ 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,