bzr push into mysql-trunk branch (rohit.kalhans:3970 to 3971) WL#5597

[Rohit Kalhans]

 3971 Rohit Kalhans	2012-06-06
      WL#5597: Removed find_row() remnants from the trunk.
      This function was removed as the part of WL#5597. 

    modified:
      sql/log_event.h
 3970 Vasil Dimov	2012-06-06
      Followup to WL#6189 Turn InnoDB persistent statistics ON by default
      
      Adjust mtr tests, part 26.
      
      Persistent stats use a different sampling algorithm so it is possible
      that the stats numbers differ from transient stats.
      
      Also, persistent stats are updated less frequently or with a delay, so
      it is possible that persistent stats are not up to date as transient were
      even if both algorithms would return the same results.
      
      The order of the returned rows by a SELECT query depends on the stats and
      thus, if possible, we fix tests by prepending "-- sorted_result" to SELECTs
      that happen to return rows in different order.
      
      If possible, each failing test was fixed by manually running ANALYZE TABLE.
      This is doable if both transient and persistent sampling algorithms end up
      with the same numbers for the given table and its data.
      
      If persistent stats result in different stats, then test failures were fixed
      by forcing the usage of transient stats for the table by using
      CREATE TABLE ... STATS_PERSISTENT=0.
      
      Intentionally do not fix the tests by using persistent stats and adjustin
      the output of EXPLAIN in .result files because a different execution plan
      may cause a different code path to be executed, than the one originally
      intended in the test.

    modified:
      mysql-test/include/index_merge1.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/index_merge_ror.inc
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/t/index_merge_innodb.test
=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2012-05-03 09:41:32 +0000
+++ b/sql/log_event.h	2012-06-06 09:52:35 +0000
@@ -65,8 +65,6 @@ typedef struct st_db_worker_hash_entry d
 */
 #define TEMP_FILE_MAX_LEN UUID_LENGTH+38 
 
-#define LONG_FIND_ROW_THRESHOLD 60 /* seconds */
-
 /**
    Either assert or return an error.
 
@@ -4076,8 +4074,6 @@ protected:
   List<uchar> m_distinct_key_list;
   List_iterator_fast<uchar> m_itr;
 
-  int find_row(const Relay_log_info *const);
-
   // Unpack the current row into m_table->record[0]
   int unpack_current_row(const Relay_log_info *const rli,
                          MY_BITMAP const *cols)

No bundle (reason: useless for push emails).