Commit 2131efb1 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 


sql/log_event.cc:
  Auto merged
parents 29b4d186 361d8fe5

sql/log_event.cc

+4 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,6 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) 
    VOID(pthread_mutex_unlock(&LOCK_thread_count));

    thd->variables.pseudo_thread_id= thread_id;		// for temp tables



    mysql_log.write(thd,COM_QUERY,"%s",thd->query);

    DBUG_PRINT("query",("%s",thd->query));

    if (ignored_error_code((expected_error= error_code)) ||

	!check_expected_error(thd,rli,expected_error))
@@ -1046,6 +1045,10 @@ START SLAVE; . Query: '%s'", expected_error, thd->query); 
      goto end;

    }



    /* If the query was not ignored, it is printed to the general log */

    if (thd->net.last_errno != ER_SLAVE_IGNORED_TABLE)

      mysql_log.write(thd,COM_QUERY,"%s",thd->query);



    /*

      If we expected a non-zero error code, and we don't get the same error

      code, and none of them should be ignored.