List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:April 27 2012 8:21am
Subject:bzr push into mysql-trunk branch (magnus.blaudd:3700 to 3749) Bug#13735712
View as plain text  
 3749 Norvald H. Ryeng	2012-04-27
      Bug#13735712 SELECT W/ SUBQUERY PRODUCES MORE ROWS WHEN USING
      VARIABLES
      
      Outer join queries with ALL may return incorrect results because the
      optimizer incorrectly rewrites them to use inner join. E.g.:
      
      SELECT *
      FROM t2 RIGHT JOIN t3 ON(t3.c = t2.b)
      WHERE t2.b < ALL(SELECT t1.a FROM t1 WHERE t1.a <= 7);
      
      is first rewritten by Item_in_subselect::single_value_transformer()
      into:
      
      SELECT *
      FROM t2 RIGHT JOIN t3 ON(t3.c = t2.b)
      WHERE <not>(t2.b >= (SELECT MIN(t1.a) FROM t1 WHERE t1.a <= 7));
      
      When simplify_joins() checks not_null_tables() on the <not> condition
      to find out if the outer join can be transformed into an inner join,
      Item_func::not_null_tables() returns its arguments'
      not_null_tables(). This means that simplify_joins() is told that the
      condition will be false if t2.b is NULL. But the condition is actually
      true if t1 has no rows where t1.a <= 7. This leads to the optimizer
      incorrectly rewriting the query to use inner join.
      
      Fix: Let Item_func_not_all::not_null_tables() return a zero table map.
     @ mysql-test/include/subquery.inc
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_all.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_all_bka.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_all_bka_nixbnl.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_nomat_nosj.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_nomat_nosj_bka.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_none.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_none_bka.result
        Add test cases for bugs #13735712.
     @ mysql-test/r/subquery_none_bka_nixbnl.result
        Add test cases for bugs #13735712.
     @ sql/item_cmpfunc.h
        Return 0 from Item_func_not_all::not_null_tables().

    modified:
      mysql-test/include/subquery.inc
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_bka.result
      mysql-test/r/subquery_all_bka_nixbnl.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_bka.result
      mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_bka.result
      mysql-test/r/subquery_none_bka_nixbnl.result
      sql/item_cmpfunc.h
 3748 Sunny Bains	2012-04-27
      Bug#14004341 - REDUCE MEMCPY() OVERHEAD IN ROW_SEARCH_FOR_MYSQL()
      
      InnoDB uses a read ahead cache for rows that can potentially be accessed in a 
      batch. This is to avoid the overhead of mini-transactions. Currently, all 
      records are copied to this fetch cache and when we exit from the function 
      we copy the first record from this queue to the MySQL buffer. Avoid this copy 
      to the fetch cache queue and back on normal exit from the function by doing the 
      changes directly in the MySQL recod buffer for the first record. 
      
      This eliminates two memcpy() calls but is only done for non-ICP code paths.
      
      rb://1046 Approved by Jimmy.

    modified:
      storage/innobase/row/row0sel.cc
 3747 irana	2012-04-26 [merge]
      Merge from 5.5

    modified:
      storage/innobase/fil/fil0fil.cc
 3746 Manish Kumar	2012-04-26 [merge]
      merging mysql-5.5 -> mysql-trunk

    added:
      mysql-test/suite/rpl/t/rpl_report_port-master.opt
    modified:
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/t/rpl_report_port.test
 3745 Sergey Glukhov	2012-04-26
      test for bug13723054 is moved into separate file as
      it does not work with Innodb with 4k Page size 

    added:
      mysql-test/r/func_group_innodb_16k.result
      mysql-test/t/func_group_innodb_16k.test
    modified:
      mysql-test/r/func_group_innodb.result
      mysql-test/t/func_group_innodb.test
 3744 Jimmy Yang	2012-04-26
      Fix Bug #13867871 - ROW_INS_CHECK_FOREIGN_CONSTRAINT() ACCESSES FREED
      DICT_INDEX_T
                        
      rb://1045 approved by Marko

    added:
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/t/innodb_bug13867871.test
    modified:
      storage/innobase/dict/dict0dict.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0upd.cc
 3743 Marko Mäkelä	2012-04-26
      Restore tree_name to mysql-trunk.

    modified:
      .bzr-mysql/default.conf
 3742 Marko Mäkelä	2012-04-25
      Bug#14000415 BOGUS CHECK ON SYS_COLUMNS IN INNOBASE_RENAME_COLUMN()

    modified:
      storage/innobase/handler/handler0alter.cc
 3741 Marko Mäkelä	2012-04-25 [merge]
      Merge mysql-trunk-wl5545 to mysql-trunk.

    added:
      mysql-test/suite/innodb/include/innodb_dict.inc
      mysql-test/suite/innodb/r/innodb-alter-debug.result
      mysql-test/suite/innodb/r/innodb-alter.result
      mysql-test/suite/innodb/t/innodb-alter-debug.test
      mysql-test/suite/innodb/t/innodb-alter.test
    modified:
      .bzr-mysql/default.conf
      mysql-test/r/alter_table.result
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb_bug21704.result
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb_bug21704.test
      sql/field.h
      sql/sql_class.h
      sql/sql_table.cc
      sql/sql_yacc.yy
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0mem.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0upd.ic
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
 3740 Mattias Jonsson	2012-04-23
      Bug#13008220: HANDLER SQL STATEMENT CAN MISS TO
      INITIALIZE FOR RANDOM READ
      
      When doing index scans and then swithing to
      random scans, without restart, ha_rnd_init
      is not called, when using the HANDLER SQL
      interface.
      
      Fixed by ensuring that when switching between
      index and random scans there will always be a call to
      ha_index/rnd_end and then ha_index/rnd_init.
      
      Also checking return values from ha_index/rnd_init/end.
      
      (updated with DBUG_ASSERT from reviewers suggestion).

    modified:
      mysql-test/include/handler.inc
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/t/handler_myisam.test
      sql/sql_handler.cc
 3739 Vasil Dimov	2012-04-25
      Non-functional change: fix the names of DICT_STAT_PERSISTEN_ON/OFF macros

    modified:
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0stats.ic
 3738 Georgi Kodinov	2012-04-23
      Bug #13966514: CRASH IN GET_SCHEMA_TABLES_RESULT WITH 
      MIN/MAX, LEFT/RIGHT JOIN ON I_S TABLE
      
      When there's a MIN/MAX that's reduced to a constant due to the 
      presence of an unique index over the aggregated column the
      tables from the query are optimized away.
      If one of these removed tables happens to be a I_S table 
      the materialization check will still run due to the fact that the 
      the select_lex flag OPTION_SCHEMA_TABLE is not cleared up.
      Fixed by adding a check in get_schema_tables_result() for the 
      presence of join tables (join_tab) before an attempt is made to 
      iterate over them (which leads to a null pointer dereference crash).
      Test suite added.

    modified:
      mysql-test/r/information_schema.result
      mysql-test/t/information_schema.test
      sql/sql_show.cc
 3737 Tor Didriksen	2012-04-25
      Bug#13982125 BUFFER OVERFLOW OF VARIABLE BUF IN ITEM_FUNC_MAKETIME::GET_TIME
      
      Add space for null-terminator, which is always added by sprintf.

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
      sql/item_timefunc.cc
 3736 Vasil Dimov	2012-04-25
      Followup to vasil.dimov@stripped,
      adjust a few .result files.

    modified:
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
 3735 Vasil Dimov	2012-04-24
      Non-functional followup to vasil.dimov@stripped11-hplttae7ss0igz7f
      
      Obey alphabetical order in the lists in sql/lex.h and sql/sql_yacc.yy and
      fix quotes inside a comment in sql/handler.h.

    modified:
      sql/handler.h
      sql/lex.h
      sql/sql_yacc.yy
 3734 Sergey Glukhov	2012-04-24
      Bug#13723054 CRASH WITH MIN/MAX AFTER QUICK_GROUP_MIN_MAX_SELECT::NEXT_MIN
      The crash is caused by arbitrary memory area owerwriting in case of
      BLOB fields during attempt to copy BLOB field key image into record
      buffer(record buffer is too small to get BLOB key part image).
      note:
      QUICK_GROUP_MIN_MAX_SELECT can not work with BLOB fields
      because it uses record buffer as temporary buffer for key values
      however this case is filtered out by covering_keys() check
      in get_best_group_min_max() as BLOBs always require key length
      modificator in the key declaration and if the key has a BLOB
      then it can not be covered key.
      The fix is to use 'max_used_key_length' key length instead of 0.
     @ mysql-test/r/func_group_innodb.result
        test case
     @ mysql-test/t/func_group_innodb.test
        test case
     @ sql/opt_range.cc
        use 'max_used_key_length' key length instead of 0
        as 0 means the total length of the key and it could
        lead to arbitrary memory area owerwriting in case of
        BLOB fields.

    modified:
      mysql-test/r/func_group_innodb.result
      mysql-test/t/func_group_innodb.test
      sql/opt_range.cc
 3733 Sergey Glukhov	2012-04-24
      Bug#13011553 CRASH IN SORTCMP OR CACHED_ITEM_STR::CMP IF GROUP BY SUBQUERY WITH ROLLUP
      During of comparing of grouped values
      DATETIME values are compared as STRING
      rather than INT. It leads to crash in the
      case of NULL value comparison because val_str()
      method could return zero pointer to the string
      and further comparison fails. The fix is to
      compare DATETIME grouped values for ROLLAUP as INT.
     @ mysql-test/r/olap.result
        test case
     @ mysql-test/t/olap.test
        test case
     @ sql/item.h
        added new class Cached_item_temporal
     @ sql/item_buff.cc
        use Cached_item_temporal object if item is DATE/TIME/DATETIME
     @ sql/item_func.h
        oveloaded field_type() method for Item_func_rollup_const class

    modified:
      mysql-test/r/olap.result
      mysql-test/t/olap.test
      sql/item.h
      sql/item_buff.cc
      sql/item_func.h
 3732 Marko Mäkelä	2012-04-24
      Catch Bug#13992653 a little earlier in debug builds.

    modified:
      storage/innobase/btr/btr0cur.cc
 3731 Sergey Glukhov	2012-04-24
      Bug#13581962 HIGH MEMORY USAGE ATTEMPT, THEN CRASH WITH LONGTEXT, UNION, USER VARIABLE
      In Item_func_signed::fix_length_and_dec max_length is inherited
      from the max length of the argument. It can be huge value in case
      of LONGTEXT, for example, and leads to OOM in some situations.
      The fix is to use the minimum of args[0]->length and max possible
      number of digits for the int type.
     @ mysql-test/r/cast.result
        test case
     @ mysql-test/r/ctype_utf8mb4.result
        test case
     @ mysql-test/t/cast.test
        test case
     @ mysql-test/t/ctype_utf8mb4.test
        test case
     @ sql/item_func.h
        limit max length by MY_INT64_NUM_DECIMAL_DIGITS

    modified:
      mysql-test/r/cast.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/t/cast.test
      mysql-test/t/ctype_utf8mb4.test
      sql/item_func.h
 3730 Vasil Dimov	2012-04-24
      Implement WL#6175 Introduce persistent statistics ON/OFF switch
      
      A new table_option is added, similarly to e.g. DELAY_KEY_WRITE. Modified files are:
        include/my_base.h
        sql/handler.h
        sql/lex.h
        sql/sql_show.cc
        sql/sql_table.cc
        sql/sql_yacc.yy
      The addition of the new option is purely mechanical - copy every occurence of
      DELAY_KEY_WRITE and rename it to the new STATS_PERSISTENT option. The .frm file
      format is not changed.
      
      In the code before this WL the logic was: every time stats would be updated in
      pre-PS MySQL (e.g. MySQL 5.5) do this: try to fetch stats for that table from
      persistent stats tables (e.g. check if PS is ON for that table), if fetch
      succeeds, then this is it. If fetch fails (due to e.g. no rows for that table in
      the stats storage, PS is OFF) then calculate the stats using the old transient
      statistics method.
      
      Below by "PS enabled table" or "table has PS set to ON" we mean that either it
      been explicitly flagged as STATS_PERSISTENT=1 by CREATE/ALTER TABLE or that its
      STATS_PERSISTENT= flag is not set ('default') and the global
      innodb_stats_persistent is ON.
      
      With this WL we change the logic to: every time stats would be updated in pre-PS
      MySQL do this: check if the table has PS flag set to ON, if yes, then do nothing
      (except if the stats are not initialized (e.g. first open table), in which case
      fetch them from disk), else calculate the stats using the old transient method.
      
      So we introduce a new per-table flag and store it in the .frm file. Upon open
      table we copy that flag into dict_table_t::stat_persistent to ease
      checking the value from InnoDB internal code.
      
      We introduce a new state for a table and its indexes' stats: 'unknown' which
      means that stats have not been calculated after opening the table and should not
      be accessed when in this state. It is also unknown whether the table's
      persistent stats flag is ON or OFF. This idea comes from Marko and is based on
      the fact that stats are only needed by MySQL and are requested after a call to
      ::open(). So whenever we open a table internally in InnoDB (table not being
      opened by MySQL) we leave the stats in 'unknown' state. When ::open() is called,
      then we peek the value of the PS flag from table->s->db_create_options, save it
      in the newly introduced table->stat_persistent and do the
      corresponding action to initialize the stats -
      either fetch them from disk if PS=ON or recalc them if PS=OFF. This is done by
      the newly introduced function dict_stats_init(). The new 'unknown' state is
      designated by table->stat_initialized being FALSE.
      
      When the PS flag is changed by the user with ALTER TABLE, we need to set the new
      value in table->stat_persistent - this is done by the new function
      dict_stats_set_persistent() which is also used to set the value of the flag
      initially from inside dict_stats_init() (called from ::open() and ::create()).
      
      A new function is introduced: dict_stats_is_persistent_enabled(table) which
      checks whether PS is switched ON/OFF for the given table. This function is very
      fast because it just checks if the bits are set in
      table->stat_persistent (compared to the slow SELECTing from the stats tables
      that was done before).
      
      In row_update_statistics_if_needed() if this is PS-enabled table, then do
      nothing. This function may be called very often. Also do nothing if the stats
      are in 'unknown' state - this may happen when the table has been opened
      internally from within InnoDB (e.g. SYS_TABLES or a foreign key table, not
      opened by MySQL) and heavy DML is being done on it.
      
      ha_innobase::info() -> ::info_low() indirection is no loner needed and is
      removed. With this WL we have just one method - ::info() which checks if the
      executed command is ANALYZE and does its logic internally.
      
      Given that stats initialization is now done in ::open() and ::create() after a
      call to dict_table_open_on_name() and not in that latter function, this means
      that this function becomes the same as dict_table_open_on_name_low() and
      dict_table_open_on_name_no_stats() is no longer needed. Thus, remove
      dict_table_open_on_name() and dict_table_open_on_name_no_stats() and rename
      dict_table_open_on_name_low() to dict_table_open_on_name().
      
      The option innodb_analyze_is_persistent is no longer needed and is removed.
      
      Approved by:	Jimmy (rb:912)

    removed:
      mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result
      mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test
    added:
      mysql-test/suite/innodb/include/innodb_stats_table_flag.inc
      mysql-test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
      mysql-test/suite/innodb/r/innodb_stats_create_on_corrupted.result
      mysql-test/suite/innodb/r/innodb_stats_create_table.result
      mysql-test/suite/innodb/r/innodb_stats_fetch.result
      mysql-test/suite/innodb/r/innodb_stats_fetch_corrupted.result
      mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result
      mysql-test/suite/innodb/r/innodb_stats_flag_global_off.result
      mysql-test/suite/innodb/r/innodb_stats_flag_global_on.result
      mysql-test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
      mysql-test/suite/innodb/r/innodb_ut_format_name.result
      mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test
      mysql-test/suite/innodb/t/innodb_stats_create_table.test
      mysql-test/suite/innodb/t/innodb_stats_fetch.test
      mysql-test/suite/innodb/t/innodb_stats_fetch_corrupted.test
      mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test
      mysql-test/suite/innodb/t/innodb_stats_flag_global_off-master.opt
      mysql-test/suite/innodb/t/innodb_stats_flag_global_off.test
      mysql-test/suite/innodb/t/innodb_stats_flag_global_on-master.opt
      mysql-test/suite/innodb/t/innodb_stats_flag_global_on.test
      mysql-test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
      mysql-test/suite/innodb/t/innodb_ut_format_name.test
      mysql-test/suite/sys_vars/r/innodb_stats_persistent_basic.result
      mysql-test/suite/sys_vars/t/innodb_stats_persistent_basic.test
      storage/innobase/include/dict0stats.ic
    modified:
      include/my_base.h
      mysql-test/suite/innodb/include/innodb_stats.inc
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb_bug11933790.result
      mysql-test/suite/innodb/r/innodb_bug12429573.result
      mysql-test/suite/innodb/r/innodb_stats.result
      mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
      mysql-test/suite/innodb/t/innodb-blob.test
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb_bug11933790.test
      mysql-test/suite/innodb/t/innodb_bug12429573.test
      mysql-test/suite/innodb/t/innodb_stats.test
      mysql-test/suite/innodb/t/innodb_stats_drop_locked.test
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      scripts/mysql_system_tables.sql
      sql/handler.h
      sql/lex.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_yacc.yy
      storage/innobase/api/api0api.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/ut0ut.h
      storage/innobase/pars/pars0pars.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/ut/ut0ut.cc
 3729 Jimmy Yang	2012-04-24
      Fix a compilation warning introduced by Bug #13907075 fix.

    modified:
      storage/innobase/fts/fts0ast.cc
 3728 Sunny Bains	2012-04-24
      Bug#13993661 - GET RID OF STATIC COUNTER IN TRX_START_LOW(), USE THE TRX_T::ID AS THE COUNTER
            
      In trx_start_low() we use a static counter to control the number of 
      gettimeofday() calls we make to set the trx_t::start_time. The trx_t::id is 
      also a monotonically increasing counter and is local to the thread. Use that 
      instead. This should reduce potential cache coherency issues.
            
      Approved by Inaam over IM.

    modified:
      storage/innobase/trx/trx0trx.cc
 3727 Inaam Rana	2012-04-23 [merge]
      merge from 5.5

    modified:
      storage/innobase/buf/buf0flu.cc
 3726 Jimmy Yang	2012-04-24
      Fix Bug #13907075 - DIFFERENT RESULTS FOR DIFFERENT TERM ORDER WITH INNODB
      BOOLEAN FULLTEXT SEARCH
            
      rb://1001 approved by Sunny Bains

    modified:
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/include/fts0ast.h
 3725 Andrei Elkin	2012-04-23
      post-push fixes bug11754117-45670: fixing a race of RLI cleanup before delete thd.

    modified:
      sql/rpl_slave.cc
 3724 Georgi Kodinov	2012-04-23 [merge]
      merge

    modified:
      configure.cmake
 3723 Georgi Kodinov	2012-04-23 [merge]
      merge

    modified:
      configure.cmake
 3722 Kent Boortz	2012-04-23 [merge]
      Merge

    modified:
      storage/innobase/srv/srv0start.cc
 3721 Kent Boortz	2012-04-23 [merge]
      Merge

    modified:
      mysql-test/mysql-test-run.pl
 3720 Andrei Elkin	2012-04-23 [merge]
      merge from 5.5 (null)

 3719 Andrei Elkin	2012-04-23 [merge]
      null merge from 5.5.

 3718 Andrei Elkin	2012-04-23
      merge bug11754117-45670 fixes from 5.5: fixing error codes shift.
     @ mysql-test/extra/rpl_tests/rpl_loaddata.test
        error code shifted.
     @ mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
        error code shifted.
     @ mysql-test/r/explain.result
        results updated.
     @ mysql-test/r/get_diagnostics.result
        results updated.
     @ mysql-test/r/innodb_explain_json_non_select_all.result
        results updated.
     @ mysql-test/r/innodb_explain_json_non_select_none.result
        results updated.
     @ mysql-test/r/innodb_explain_non_select_all.result
        results updated.
     @ mysql-test/r/innodb_explain_non_select_none.result
        results updated.
     @ mysql-test/r/myisam_explain_json_non_select_all.result
        results updated.
     @ mysql-test/r/myisam_explain_json_non_select_none.result
        results updated.
     @ mysql-test/r/myisam_explain_non_select_all.result
        results updated.
     @ mysql-test/r/myisam_explain_non_select_none.result
        results updated.
     @ mysql-test/r/partition_error.result
        results updated.
     @ mysql-test/r/partition_exchange.result
        results updated.
     @ mysql-test/r/read_only_innodb.result
        results updated.
     @ mysql-test/r/sp-destruct.result
        results updated.
     @ mysql-test/r/type_time.result
        results updated.
     @ mysql-test/r/variables.result
        results updated.
     @ mysql-test/suite/binlog/r/binlog_rewrite.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_alter_repository.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_loaddata.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
        results updated.
     @ mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
        results updated.
     @ mysql-test/suite/rpl/t/rpl_alter_repository.test
        error code shifted.
     @ mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
        error code shifted.
     @ mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
        results updated.
     @ mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
        results updated.

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/r/explain.result
      mysql-test/r/get_diagnostics.result
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_json_non_select_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_json_non_select_all.result
      mysql-test/r/myisam_explain_json_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/type_time.result
      mysql-test/r/variables.result
      mysql-test/suite/binlog/r/binlog_rewrite.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
 3717 Andrei Elkin	2012-04-23 [merge]
      merge from 5.5 repo

    modified:
      mysql-test/r/bug12427262.result
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/t/innodb-index-online.test
      storage/innobase/include/read0read.h
      storage/innobase/include/read0read.ic
      storage/innobase/read/read0read.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/trx/trx0trx.cc
 3716 Andrei Elkin	2012-04-21
      merge bug11754117-45670 fixes from 5.5: fixing result files.

    modified:
      mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
 3715 Andrei Elkin	2012-04-21 [merge]
      merge bug11754117-45670 fixes from 5.5: null merge for sql/sql_lex.h.

 3714 Andrei Elkin	2012-04-21 [merge]
      merge bug11754117-45670 fixes from 5.5.

    added:
      mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
      mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
    modified:
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/share/errmsg-utf8.txt
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
 3713 Mayank Prasad	2012-04-21 [merge]
      BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE
      
      Details:
       - Merge: mysql-5.5 -> mysql-trunk
       - Test case result modification.
       - enabling test case on windows.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/bug12427262.result
      mysql-test/t/bug12427262.test
 3712 Nuno Carvalho	2012-04-20 [merge]
      BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVER
      
      Merge from 5.5 into 5.6.
      
      Conflicts:
       * sql/binlog.cc
       * mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result

    added:
      mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result
      mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
    modified:
      sql/binlog.cc
 3711 Andrei Elkin	2012-04-20
      BUG#13893310
      
      Using the recent push's bug id to tag fixing a race condition in
      rpl_parallel_change_master.
     @ mysql-test/suite/rpl/t/rpl_parallel_change_master.test
        further improving the gaps test. 
        The previous version appeared to test select count(*) = 1 from d2.t1
        having race condition with SQL thread. 
        Consistent-read isolation of innodb can't change the first found count(*).
        So other than the blocking (13) connection should be used to select
        in autocommit on mode.

    modified:
      mysql-test/suite/rpl/t/rpl_parallel_change_master.test
 3710 Mattias Jonsson	2012-04-20
      Bug#13907676: HA_ARCHIVE::INFO
      In WL#4305 the refactoring of the archive writer,
      it could flush the writer when it was not yet open.
      
      This was due to if bulk insert was used but no
      rows was actually inserted (write_row was never called),
      the writer was marked dirty even if it was not open.
      
      Fix was to only mark it as dirty if it was opened.

    modified:
      mysql-test/r/archive.result
      mysql-test/t/archive.test
      storage/archive/ha_archive.cc
 3709 Norvald H. Ryeng	2012-04-20
      Bug#12888306 MISSING ROWS FOR SELECT >ALL (SUBQUERY WITHOUT ROWS)
      
      Problem: Subqueries with implicit grouping may return incorrect
      results due to not evaluating the WHERE clause.
      
      Queries with ALL/ANY are rewritten to use MIN/MAX. The rewritten form
      of the query has no GROUP BY clause, so these queries fit the pattern
      for triggering this bug.
      
      JOIN::optimize() calls opt_sum_query() to replace aggregation
      functions with constant fields for implicitly grouped queries. If the
      aggregation function is MIN or MAX, it checks the argument to the
      aggregation function. If it is a constant, the constant is selected as
      the minimum/maximum value if the table has rows, and NULL if it
      doesn't. However, the WHERE clause is not checked, so the MIN/MAX may
      be evaluated to a constant when it should have been NULL.
      
      Fix: Don't replace MIN/MAX of constants if there is a WHERE clause.
     @ mysql-test/r/explain.result
        Changes to EXPLAIN for queries with implicit grouping.
     @ mysql-test/r/fulltext.result
        Corrected test case for bug #12888306.
     @ mysql-test/r/group_by.result
        Add test case for bug #12888306.
     @ mysql-test/t/fulltext.test
        Corrected test case for bug #12888306.
     @ mysql-test/t/group_by.test
        Add test case for bug #12888306.
     @ sql/opt_sum.cc
        Don't replace MIN/MAX of constants if there are conds.

    modified:
      mysql-test/r/explain.result
      mysql-test/r/fulltext.result
      mysql-test/r/group_by.result
      mysql-test/t/fulltext.test
      mysql-test/t/group_by.test
      sql/opt_sum.cc
 3708 Hemant Kumar	2012-04-20
      making main.bug12427262 test experimental on windows.

    modified:
      mysql-test/collections/default.experimental
 3707 Vasil Dimov	2012-04-20
      Fix Bug#13946118 STATS RELATED, ASSERT (RW_LATCH == 1) || (RW_LATCH == 2) || (RW_LATCH == 3)
      
      This bug was introduced in vasil.dimov@stripped
      
      In btr_pcur_open_low() we shold clear the newly added flag
      BTR_ALREADY_S_LATCHED from latch_mode because later in buf_page_get_gen()
      we assert that latch_mode is one of RW_S_LATCH, RW_X_LATCH or RW_NO_LATCH.
      
      This was discussed with Marko and is fixed in WL#6175 (which is not pushed
      yet). I am not sure why it was fixed there instead of mysql-trunk, since
      the problem exists in mysql-trunk.

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0pcur.ic
 3706 Alexander Barkov	2012-04-20
      Bug#13976233 ASSERTION FAILED: !CHECK_TIME_MMSSFF_RANGE(LTIME), FILE SQL_TIME.CC, LINE 304
            
      Problem: double2lldiv_t() could errorneously return 1,000,000,000 value
      in "lld->rem" due to limited presicion of "double" arithmetics.
      
      Fix: Catch this corner case and put the reminder back into
      the expecter 0..999,999,999 range.

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/t/type_temporal_fractional.test
      strings/decimal.c
 3705 Hemant Kumar	2012-04-20
      Added "rpl_binlog_n_mix_MTS" to mysql-trunk per push run.

    modified:
      mysql-test/collections/default.push
 3704 Vasil Dimov	2012-04-20
      Assert that a transaction which is being freed is not on
      trx->in_mysql_list.
      
      This assertion is added to help track down:
      
      Bug#13966453 CONCURRENT DML AND READS FROM I_S TABLES CRASH
        FETCH_DATA_INTO_CACHE_LOW
      Bug#13980608 CRASH OF SERVER IN THE TEST RQG_INFO_SCHEMA ON WIN
      
      but it should be there anyway, so it will be left even after the bugs
      are fixed.
      
      Suggested by:	Sunny

    modified:
      storage/innobase/trx/trx0trx.cc
 3703 Tor Didriksen	2012-04-20
      Bug#12790933 MULTIPLE DEADLOCKS / BOTTLENECKS INVOLVING LOCK_THREAD_COUNT
      
      LOCK_thread_count should protect the list of THD only,
      not the internal state of a THD.
     @ include/mysql/thread_pool_priv.h
        Declare remove_global_thread here, since it is used by the thread_pool.
     @ sql/mysqld.cc
        Remove delete_thd(), add destroy_thd() instead.
     @ sql/mysqld.h
        Remove delete_thd(), add destroy_thd() instead.
     @ sql/scheduler.cc
        Remove delete_thd(), add destroy_thd() instead.
     @ sql/sql_class.cc
        We should not hold LOCK_thread_count when running the THD DTOR.
        Grab LOCK_status before updating global_status_var.
     @ sql/sql_parse.cc
        We should not hold LOCK_thread_count when running the THD DTOR.

    modified:
      include/mysql/thread_pool_priv.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/scheduler.cc
      sql/sql_class.cc
      sql/sql_parse.cc
      sql/sql_show.cc
 3702 Oystein Grovlen	2012-04-20 [merge]
      Final merge mysql-trunk => mysql-wl#6043.
      No issues.

    added:
      mysql-test/r/bug12427262.result
      mysql-test/r/myisam_row_rpl.result
      mysql-test/t/bug12427262.test
      mysql-test/t/myisam_row_rpl-master.opt
      mysql-test/t/myisam_row_rpl-slave.opt
      mysql-test/t/myisam_row_rpl.test
    modified:
      CMakeLists.txt
      README
      VERSION
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      cmake/os/Windows.cmake
      config.h.cmake
      extra/innochecksum.cc
      extra/perror.c
      include/welcome_copyright_notice.h
      mysql-test/include/assert_command_output.inc
      mysql-test/lib/My/CoreDump.pm
      mysql-test/r/log_tables.result
      mysql-test/r/rewrite_general_log.result
      mysql-test/suite/binlog/r/binlog_grant.result
      mysql-test/suite/binlog/r/binlog_multi_engine.result
      mysql-test/suite/binlog/t/binlog_grant.test
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/t/innodb-alter-discard.test
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/r/rpl_gtid_mode.result
      mysql-test/suite/rpl/t/rpl_corruption.test
      mysql-test/suite/rpl/t/rpl_gtid_mode.test
      mysql-test/suite/rpl/t/rpl_parallel_change_master.test
      mysql-test/t/rewrite_general_log.test
      packaging/WiX/custom_ui.wxs
      sql/gen_lex_hash.cc
      sql/ha_ndbcluster_binlog.cc
      sql/item.cc
      sql/item.h
      sql/item_func.cc
      sql/item_func.h
      sql/log_event.cc
      sql/log_event.h
      sql/mysqld.cc
      sql/rpl_info_file.cc
      sql/rpl_mi.cc
      sql/set_var.cc
      sql/sql_executor.cc
      sql/sql_parse.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_show.h
      sql/sql_string.h
      storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0lex.l
      storage/myisam/ha_myisam.cc
      storage/perfschema/gen_pfs_lex_token.cc
 3701 Oystein Grovlen	2012-04-18
      WL#6043 - Optimizations for InnoDB's FTS
      
      The optimization where tables rows are not accessed when only
      document ID and ranking score was requested, did not apply when
      there was no ORDER BY clause.  This is fixed by this patch.
      
      The reason for the issue was that when there was no ORDER BY
      clause, a flag FT_SORTED was set to signal to the storage engine
      that it should do the sorting.  This caused the optimizer to
      believe that the MATCH expression in the WHERE clause and the 
      SELECT list were not equivalent.  The fix is to not consider
      the FT_SORTED flag when considering equivalence.
      
      Activating this optimization revealed two bugs than needed to
      be fixed:
      1. Item_func_docid needs to set const_item_cache to false to
         prevent the optimizer from considering this function to be
         constant.
      2. The optimization has not been implemented to handle queries
         that contain a GROUP BY clause.
     @ sql/item_func.cc
        Item_func_match::eq should ignore the FT_SORTED flag when
        testing for equality.  The results are the same regardless of sorting.
     @ sql/item_func.h
        Item_func_docid::update_used_tables() should set
        const_item_cache to false so it is not considered a constant.
     @ sql/sql_optimizer.cc
        Prevent the "convering FTS index" optimization from be applied
        when query has a GROUP BY clause.

    modified:
      sql/item_func.cc
      sql/item_func.h
      sql/sql_optimizer.cc
 3700 Oystein Grovlen	2012-04-18 [merge]
      Merge mysql-trunk => mysql-wl6043
      Adjusted to Item::name to Item::item_name renaming.

    removed:
      mysql-test/suite/rpl/t/rpl_report_port-slave.opt
    added:
      mysql-test/r/mysql_embedded_client_test.result
      mysql-test/r/partition_locking_4.result
      mysql-test/suite/binlog/r/binlog_gtid_cache.result
      mysql-test/suite/binlog/t/binlog_gtid_cache-master.opt
      mysql-test/suite/binlog/t/binlog_gtid_cache.test
      mysql-test/suite/innodb/r/innodb-alter-discard.result
      mysql-test/suite/innodb/r/innodb-index-online-delete.result
      mysql-test/suite/innodb/t/innodb-alter-discard.test
      mysql-test/suite/innodb/t/innodb-index-online-delete.test
      mysql-test/suite/perfschema/r/statement_digest_charset.result
      mysql-test/suite/perfschema/t/statement_digest_charset.test
      mysql-test/suite/rpl/r/rpl_parallel_change_master.result
      mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-master.opt
      mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_change_master-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_change_master.test
      mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog-master.opt
      mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog-master.opt
      mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog-slave.opt
      mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
      mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test
      mysql-test/t/mysql_embedded_client_test.test
      mysql-test/t/partition_locking_4.test
    modified:
      CMakeLists.txt
      cmake/build_configurations/compiler_options.cmake
      cmake/libutils.cmake
      cmd-line-utils/libedit/map.c
      cmd-line-utils/libedit/tty.c
      configure.cmake
      extra/yassl/src/buffer.cpp
      include/mysql/psi/mysql_statement.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql_com.h
      libmysqld/CMakeLists.txt
      libmysqld/lib_sql.cc
      mysql-test/collections/default.push
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
      mysql-test/extra/rpl_tests/rpl_mixing_engines.test
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
      mysql-test/extra/rpl_tests/rpl_reset_slave.test
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/include/function_defaults.inc
      mysql-test/include/rpl_change_topology.inc
      mysql-test/include/show_events.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/auth_rpl.result
      mysql-test/r/derived.result
      mysql-test/r/explain.result
      mysql-test/r/function_defaults.result
      mysql-test/r/get_diagnostics.result
      mysql-test/r/grant.result
      mysql-test/r/help.result
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_json_non_select_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_json_non_select_all.result
      mysql-test/r/myisam_explain_json_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/partition_cache.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/ps.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/rpl_mysqldump_slave.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/sp-threads.result
      mysql-test/r/sp.result
      mysql-test/r/tablespace.result
      mysql-test/r/type_time.result
      mysql-test/r/variables.result
      mysql-test/suite/binlog/r/binlog_rewrite.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/engines/funcs/t/crash_manytables_number.test
      mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test
      mysql-test/suite/engines/funcs/t/se_join_cross.test
      mysql-test/suite/engines/funcs/t/se_join_default.test
      mysql-test/suite/engines/funcs/t/se_join_inner.test
      mysql-test/suite/engines/funcs/t/se_join_left.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_right.test
      mysql-test/suite/engines/funcs/t/se_join_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_straight.test
      mysql-test/suite/engines/funcs/t/se_string_limit.test
      mysql-test/suite/engines/iuds/t/update_delete_number.test
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_bug30423.test
      mysql-test/suite/innodb/t/innodb_bug53290.test
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/opt_trace/r/eq_range_statistics.result
      mysql-test/suite/opt_trace/r/filesort_pq.result
      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_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.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
      mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/opt_trace/r/temp_table.result
      mysql-test/suite/parts/r/partition_exch_qa_12.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/parts/t/partition_exch_qa_12.test
      mysql-test/suite/parts/t/partition_float_myisam.test
      mysql-test/suite/perfschema/include/digest_cleanup.inc
      mysql-test/suite/perfschema/include/digest_execution.inc
      mysql-test/suite/perfschema/include/digest_setup.inc
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/r/start_server_no_digests.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_consumers2.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      mysql-test/suite/perfschema/t/dml_setup_instruments.test
      mysql-test/suite/rpl/r/rpl_000010.result
      mysql-test/suite/rpl/r/rpl_000011.result
      mysql-test/suite/rpl/r/rpl_000013.result
      mysql-test/suite/rpl/r/rpl_000017.result
      mysql-test/suite/rpl/r/rpl_DML_error.result
      mysql-test/suite/rpl/r/rpl_EE_err.result
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result
      mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_alter_db.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_auto_increment.result
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
      mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_binlog_corruption.result
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/r/rpl_binlog_grant.result
      mysql-test/suite/rpl/r/rpl_binlog_index.result
      mysql-test/suite/rpl/r/rpl_bit.result
      mysql-test/suite/rpl/r/rpl_bit_npk.result
      mysql-test/suite/rpl/r/rpl_blackhole.result
      mysql-test/suite/rpl/r/rpl_bug26395.result
      mysql-test/suite/rpl/r/rpl_bug31076.result
      mysql-test/suite/rpl/r/rpl_bug33931.result
      mysql-test/suite/rpl/r/rpl_bug37426.result
      mysql-test/suite/rpl/r/rpl_bug38694.result
      mysql-test/suite/rpl/r/rpl_bug41902.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/suite/rpl/r/rpl_change_master_dbug.result
      mysql-test/suite/rpl/r/rpl_charset.result
      mysql-test/suite/rpl/r/rpl_charset_sjis.result
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_checksum_cache.result
      mysql-test/suite/rpl/r/rpl_checksum_undef.result
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/r/rpl_colSize.result
      mysql-test/suite/rpl/r/rpl_commit_after_flush.result
      mysql-test/suite/rpl/r/rpl_concurrency_error.result
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_connection.result
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_create_database.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_cross_version.result
      mysql-test/suite/rpl/r/rpl_current_user.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_delete_no_where.result
      mysql-test/suite/rpl/r/rpl_do_db_filter.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result
      mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_db.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_drop_view.result
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
      mysql-test/suite/rpl/r/rpl_empty_master_host.result
      mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_events.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
      mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/r/rpl_filter_database.result
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_flush_logs.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
      mysql-test/suite/rpl/r/rpl_free_items.result
      mysql-test/suite/rpl/r/rpl_function_defaults.result
      mysql-test/suite/rpl/r/rpl_general_log.result
      mysql-test/suite/rpl/r/rpl_geometry.result
      mysql-test/suite/rpl/r/rpl_get_lock.result
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/r/rpl_grant.result
      mysql-test/suite/rpl/r/rpl_grant_plugin.result
      mysql-test/suite/rpl/r/rpl_gtid_empty_group.result
      mysql-test/suite/rpl/r/rpl_gtid_execution.result
      mysql-test/suite/rpl/r/rpl_gtid_failover.result
      mysql-test/suite/rpl/r/rpl_gtid_lost_fail_to_connect.result
      mysql-test/suite/rpl/r/rpl_gtid_lost_maintained.result
      mysql-test/suite/rpl/r/rpl_gtid_mode.result
      mysql-test/suite/rpl/r/rpl_gtid_parallel.result
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result
      mysql-test/suite/rpl/r/rpl_idempotency.result
      mysql-test/suite/rpl/r/rpl_ignore_db_filter.result
      mysql-test/suite/rpl/r/rpl_ignore_grant.result
      mysql-test/suite/rpl/r/rpl_ignore_revoke.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result
      mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result
      mysql-test/suite/rpl/r/rpl_ignore_table_update.result
      mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_init_slave.result
      mysql-test/suite/rpl/r/rpl_init_slave_errors.result
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
      mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_insert.result
      mysql-test/suite/rpl/r/rpl_insert_id.result
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result
      mysql-test/suite/rpl/r/rpl_insert_ignore.result
      mysql-test/suite/rpl/r/rpl_invoked_features.result
      mysql-test/suite/rpl/r/rpl_ip_mix.result
      mysql-test/suite/rpl/r/rpl_ip_mix2.result
      mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result
      mysql-test/suite/rpl/r/rpl_ipv6.result
      mysql-test/suite/rpl/r/rpl_killed_ddl.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      mysql-test/suite/rpl/r/rpl_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_loaddata_map.result
      mysql-test/suite/rpl/r/rpl_loaddata_s.result
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result
      mysql-test/suite/rpl/r/rpl_loaddata_symlink.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result
      mysql-test/suite/rpl/r/rpl_loadfile.result
      mysql-test/suite/rpl/r/rpl_locale.result
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/r/rpl_many_optimize.result
      mysql-test/suite/rpl/r/rpl_master_connection.result
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/r/rpl_migration_crash_safe.result
      mysql-test/suite/rpl/r/rpl_misc_functions.result
      mysql-test/suite/rpl/r/rpl_mix_found_rows.result
      mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/r/rpl_mts_debug.result
      mysql-test/suite/rpl/r/rpl_multi_delete.result
      mysql-test/suite/rpl/r/rpl_multi_delete2.result
      mysql-test/suite/rpl/r/rpl_multi_engine.result
      mysql-test/suite/rpl/r/rpl_multi_update.result
      mysql-test/suite/rpl/r/rpl_multi_update2.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_multi_update4.result
      mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
      mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result
      mysql-test/suite/rpl/r/rpl_name_const.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
      mysql-test/suite/rpl/r/rpl_not_null_innodb.result
      mysql-test/suite/rpl/r/rpl_not_null_myisam.result
      mysql-test/suite/rpl/r/rpl_optimize.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/rpl/r/rpl_parallel_ddl.result
      mysql-test/suite/rpl/r/rpl_parallel_innodb.result
      mysql-test/suite/rpl/r/rpl_parallel_load_data.result
      mysql-test/suite/rpl/r/rpl_parallel_multi_db.result
      mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result
      mysql-test/suite/rpl/r/rpl_parallel_temp_query.result
      mysql-test/suite/rpl/r/rpl_partition_archive.result
      mysql-test/suite/rpl/r/rpl_partition_innodb.result
      mysql-test/suite/rpl/r/rpl_partition_memory.result
      mysql-test/suite/rpl/r/rpl_partition_myisam.result
      mysql-test/suite/rpl/r/rpl_plugin_load.result
      mysql-test/suite/rpl/r/rpl_ps.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result
      mysql-test/suite/rpl/r/rpl_read_only.result
      mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
      mysql-test/suite/rpl/r/rpl_report.result
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result
      mysql-test/suite/rpl/r/rpl_rewrt_db.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
      mysql-test/suite/rpl/r/rpl_row_001.result
      mysql-test/suite/rpl/r/rpl_row_4_bytes.result
      mysql-test/suite/rpl/r/rpl_row_NOW.result
      mysql-test/suite/rpl/r/rpl_row_USER.result
      mysql-test/suite/rpl/r/rpl_row_UUID.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_basic_8partition.result
      mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
      mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/r/rpl_row_corruption.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      mysql-test/suite/rpl/r/rpl_row_find_row.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_func001.result
      mysql-test/suite/rpl/r/rpl_row_func002.result
      mysql-test/suite/rpl/r/rpl_row_func003.result
      mysql-test/suite/rpl/r/rpl_row_idempotency.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/r/rpl_row_img_blobs.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_full.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_min.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_full.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_min.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result
      mysql-test/suite/rpl/r/rpl_row_img_misc.result
      mysql-test/suite/rpl/r/rpl_row_img_sanity.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result
      mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
      mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_row_sp001.result
      mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp008.result
      mysql-test/suite/rpl/r/rpl_row_sp009.result
      mysql-test/suite/rpl/r/rpl_row_sp010.result
      mysql-test/suite/rpl/r/rpl_row_sp011.result
      mysql-test/suite/rpl/r/rpl_row_sp012.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result
      mysql-test/suite/rpl/r/rpl_row_trig001.result
      mysql-test/suite/rpl/r/rpl_row_trig002.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_row_trig004.result
      mysql-test/suite/rpl/r/rpl_row_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
      mysql-test/suite/rpl/r/rpl_row_utf16.result
      mysql-test/suite/rpl/r/rpl_row_utf32.result
      mysql-test/suite/rpl/r/rpl_row_view01.result
      mysql-test/suite/rpl/r/rpl_row_wide_table.result
      mysql-test/suite/rpl/r/rpl_savepoint.result
      mysql-test/suite/rpl/r/rpl_seconds_behind_master.result
      mysql-test/suite/rpl/r/rpl_semi_sync.result
      mysql-test/suite/rpl/r/rpl_semi_sync_event.result
      mysql-test/suite/rpl/r/rpl_sequential.result
      mysql-test/suite/rpl/r/rpl_server_id1.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_server_id_ignore.result
      mysql-test/suite/rpl/r/rpl_server_uuid.result
      mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_set_charset.result
      mysql-test/suite/rpl/r/rpl_set_null_innodb.result
      mysql-test/suite/rpl/r/rpl_set_null_myisam.result
      mysql-test/suite/rpl/r/rpl_show_errors.result
      mysql-test/suite/rpl/r/rpl_show_master_info_file.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/r/rpl_show_slave_running.result
      mysql-test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
      mysql-test/suite/rpl/r/rpl_skip_error.result
      mysql-test/suite/rpl/r/rpl_skip_incident.result
      mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
      mysql-test/suite/rpl/r/rpl_slave_load_in.result
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
      mysql-test/suite/rpl/r/rpl_slave_skip.result
      mysql-test/suite/rpl/r/rpl_slave_start.result
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/r/rpl_slow_query_log.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_sp004.result
      mysql-test/suite/rpl/r/rpl_sp_effects.result
      mysql-test/suite/rpl/r/rpl_spec_variables.result
      mysql-test/suite/rpl/r/rpl_sporadic_master.result
      mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_conflicts.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_found_rows.result
      mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_stm_innodb.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/r/rpl_stm_loadfile.result
      mysql-test/suite/rpl/r/rpl_stm_log.result
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_multi_query.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
      mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/r/rpl_stm_user_variables.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/rpl/r/rpl_sync.result
      mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/r/rpl_temporal_fractional.result
      mysql-test/suite/rpl/r/rpl_temporary.result
      mysql-test/suite/rpl/r/rpl_temporary_errors.result
      mysql-test/suite/rpl/r/rpl_test_framework.result
      mysql-test/suite/rpl/r/rpl_timezone.result
      mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
      mysql-test/suite/rpl/r/rpl_trigger.result
      mysql-test/suite/rpl/r/rpl_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
      mysql-test/suite/rpl/r/rpl_typeconv.result
      mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
      mysql-test/suite/rpl/r/rpl_udf.result
      mysql-test/suite/rpl/r/rpl_user.result
      mysql-test/suite/rpl/r/rpl_user_variables.result
      mysql-test/suite/rpl/r/rpl_variables.result
      mysql-test/suite/rpl/r/rpl_variables_stm.result
      mysql-test/suite/rpl/r/rpl_view.result
      mysql-test/suite/rpl/r/rpl_view_multi.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_binlog_index.test
      mysql-test/suite/rpl/t/rpl_bug33931.test
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_connection.test
      mysql-test/suite/rpl/t/rpl_corruption.test
      mysql-test/suite/rpl/t/rpl_gtid_mode.test
      mysql-test/suite/rpl/t/rpl_heartbeat.test
      mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
      mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
      mysql-test/suite/rpl/t/rpl_ip_mix.test
      mysql-test/suite/rpl/t/rpl_ip_mix2.test
      mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.test
      mysql-test/suite/rpl/t/rpl_ipv6.test
      mysql-test/suite/rpl/t/rpl_master_connection.test
      mysql-test/suite/rpl/t/rpl_master_pos_wait.test
      mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
      mysql-test/suite/rpl/t/rpl_mts_debug.test
      mysql-test/suite/rpl/t/rpl_parallel_innodb.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_report_port.test
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
      mysql-test/suite/rpl/t/rpl_row_crash_safe.test
      mysql-test/suite/rpl/t/rpl_row_img_blobs.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_full.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_full.test
      mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
      mysql-test/suite/rpl/t/rpl_semi_sync.test
      mysql-test/suite/rpl/t/rpl_server_id_ignore.test
      mysql-test/suite/rpl/t/rpl_server_uuid.test
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
      mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_ssl.test
      mysql-test/suite/rpl/t/rpl_ssl1.test
      mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
      mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
      mysql-test/suite/sys_vars/r/relay_log_basename_basic.result
      mysql-test/suite/sys_vars/r/relay_log_index_basic.result
      mysql-test/suite/sys_vars/r/relay_log_recovery_basic.result
      mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
      mysql-test/suite/sys_vars/t/relay_log_recovery_basic.test
      mysql-test/t/alter_table.test
      mysql-test/t/auth_rpl.test
      mysql-test/t/derived.test
      mysql-test/t/disabled.def
      mysql-test/t/grant.test
      mysql-test/t/help.test
      mysql-test/t/index_merge_innodb.test
      mysql-test/t/innodb_explain_json_non_select_all.test
      mysql-test/t/innodb_explain_non_select_all.test
      mysql-test/t/innodb_explain_non_select_none.test
      mysql-test/t/mysql_client_test_embedded.test
      mysql-test/t/partition_cache.test
      mysql-test/t/partition_exchange.test
      mysql-test/t/ps.test
      mysql-test/t/show_check.test
      mysql-test/t/sp-threads.test
      mysql-test/t/sp.test
      mysql-test/t/tablespace.test
      mysys/lf_alloc-pin.c
      mysys/psi_noop.c
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
      plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc
      plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/event_scheduler.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/global_threads.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_geofunc.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/lex.h
      sql/log.h
      sql/log_event.cc
      sql/md5.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_explain_json.cc
      sql/opt_trace.cc
      sql/opt_trace2server.cc
      sql/partition_info.cc
      sql/procedure.cc
      sql/procedure.h
      sql/rpl_info_dummy.cc
      sql/rpl_info_dummy.h
      sql/rpl_info_factory.cc
      sql/rpl_info_factory.h
      sql/rpl_info_file.cc
      sql/rpl_info_file.h
      sql/rpl_info_handler.h
      sql/rpl_info_table.cc
      sql/rpl_info_table.h
      sql/rpl_master.cc
      sql/rpl_mi.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/scheduler.cc
      sql/share/errmsg-utf8.txt
      sql/signal_handler.cc
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_derived.cc
      sql/sql_executor.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_optimizer.cc
      sql/sql_optimizer.h
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition_admin.cc
      sql/sql_planner.cc
      sql/sql_plugin.cc
      sql/sql_profile.cc
      sql/sql_reload.cc
      sql/sql_resolver.cc
      sql/sql_show.cc
      sql/sql_show.h
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_tmp_table.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/table.cc
      sql/table.h
      sql/unireg.cc
      storage/example/ha_example.cc
      storage/innobase/api/api0api.cc
      storage/innobase/api/api0misc.cc
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0dump.cc
      storage/innobase/buf/buf0rea.cc
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0blex.cc
      storage/innobase/fts/fts0blex.l
      storage/innobase/fts/fts0config.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0sql.cc
      storage/innobase/fts/fts0tlex.cc
      storage/innobase/fts/fts0tlex.l
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/api0api.h
      storage/innobase/include/api0misc.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/data0data.h
      storage/innobase/include/data0data.ic
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0ast.h
      storage/innobase/include/fts0fts.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/fts0types.h
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/log0recv.h
      storage/innobase/include/que0que.h
      storage/innobase/include/read0read.h
      storage/innobase/include/read0read.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0ftsort.h
      storage/innobase/include/row0ins.h
      storage/innobase/include/row0log.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0sel.h
      storage/innobase/include/row0uins.h
      storage/innobase/include/row0umod.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/row0vers.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/srv0start.h
      storage/innobase/include/trx0rec.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/ut0ut.h
      storage/innobase/include/ut0vec.ic
      storage/innobase/lock/lock0lock.cc
      storage/innobase/log/log0recv.cc
      storage/innobase/os/os0file.cc
      storage/innobase/que/que0que.cc
      storage/innobase/rem/rem0rec.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0undo.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/row/row0vers.cc
      storage/innobase/srv/srv0conc.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.cc
      storage/innobase/trx/trx0undo.cc
      storage/innobase/ut/ut0ut.cc
      storage/myisam/ha_myisam.cc
      storage/ndb/compile-cluster
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_check.cc
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
      storage/perfschema/pfs_instr.cc
      strings/ctype-uca.c
      unittest/gunit/alignment-t.cc
      unittest/gunit/fake_table.h
      unittest/gunit/field-t.cc
      unittest/gunit/field_timestamp-t.cc

Diff too large for email (45385 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (magnus.blaudd:3700 to 3749) Bug#13735712magnus.blaudd27 Apr