Commit 0b4db8ad authored by unknown's avatar unknown
Browse files

Fixed previous patch, wrong if() -test.

parent fbd929f8

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -3571,8 +3571,8 @@ mysql_execute_command(THD *thd) 
        res= TRUE; // cannot happen

      else

      {

        if ((thd->options & OPTION_KEEP_LOG) &&

            thd->no_trans_update.all && !thd->slave_thread)

        if (((thd->options & OPTION_KEEP_LOG) || thd->no_trans_update.all) &&

            !thd->slave_thread)

          push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,

                       ER_WARNING_NOT_COMPLETE_ROLLBACK,

                       ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));