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

fixed bad merge

parent f7f940fc

sql/sql_parse.cc

+4 −8
Original line number Diff line number Diff line
@@ -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,