From: Tor Didriksen
Date: September 19 2011 11:29am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3411 to 3412) Bug#12981106
List-Archive: http://lists.mysql.com/commits/141012
X-Bug: 12981106
Message-Id: <201109191129.p8JBTtvO026529@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3412 Tor Didriksen	2011-09-19
      Bug#12981106 ADD OPTIMIZER TRACES FOR FOR FILESORT
      
      Implements the filesort() part of WL#5834
     @ mysql-test/suite/opt_trace/include/filesort_pq.inc
        New tests.
     @ mysql-test/suite/opt_trace/r/filesort_pq.result
        New tests.
     @ sql/filesort.cc
        Add some tracing.
        Remove TEST_filesort(), add trace_filesort_information()
     @ sql/opt_trace.h
        Add some more add() member functions.
        Declare add(const char*) and add(const char*, const char*) as private,
        to avoid type conversion and calling add(const char*, bool) instead.
     @ sql/sql_test.cc
        Remove TEST_filesort()
     @ sql/sql_test.h
        Remove TEST_filesort()

    added:
      mysql-test/suite/opt_trace/include/filesort_pq.inc
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/t/filesort_pq.test
    modified:
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      sql/filesort.cc
      sql/opt_range.cc
      sql/opt_trace.h
      sql/sql_test.cc
      sql/sql_test.h
 3411 Rohit Kalhans	2011-09-19
      BUG#12765441:RPL_ROW_IGNORABLE_EVENT FAILS SPORADICALLY: CRASH IN DBUG CODE
      
      Problem: rpl.rpl_row_ingnorable_event failed ob pb2:crash in dbug code.
      
      Background: resetting the debug variable (on the master),
      while the dump thread is running, may cause sporadic
      races between user and dump threads.
      
      Fix: 
      1. Skip slave start in the begining (delay till needed).
      2. Change the values of debug variables.
      3. Start the slave thread (when needed).
     @ mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
        Updated result file.
     @ mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
        Delay the start of slave threads on slave connection till  required.

    modified:
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test

Diff too large for email (12757 lines, the limit is 10000).
No bundle (reason: useless for push emails).