List:Commits« Previous MessageNext Message »
From:MySQL Release Engineering Date:October 15 2012 1:46pm
Subject:bzr push into mysql-5.6 branch (mysql-re_ww_grp:4123 to 4229)
View as plain text  
 4229 mysql-builder@stripped	2012-09-04
      

 4228 horst.hunger@stripped	2012-09-04
      Tests around max number of partitions.

    added:
      mysql-test/suite/parts/inc/partition_max_parts_hash.inc
      mysql-test/suite/parts/inc/partition_max_parts_inv.inc
      mysql-test/suite/parts/inc/partition_max_parts_key.inc
      mysql-test/suite/parts/inc/partition_max_parts_list.inc
      mysql-test/suite/parts/inc/partition_max_parts_range.inc
      mysql-test/suite/parts/inc/partition_max_sub_parts_key_list.inc
      mysql-test/suite/parts/inc/partition_max_sub_parts_key_range.inc
      mysql-test/suite/parts/inc/partition_max_sub_parts_list.inc
      mysql-test/suite/parts/inc/partition_max_sub_parts_range.inc
      mysql-test/suite/parts/r/partition_max_parts_hash_innodb.result
      mysql-test/suite/parts/r/partition_max_parts_hash_myisam.result
      mysql-test/suite/parts/r/partition_max_parts_inv_innodb.result
      mysql-test/suite/parts/r/partition_max_parts_inv_myisam.result
      mysql-test/suite/parts/r/partition_max_parts_key_innodb.result
      mysql-test/suite/parts/r/partition_max_parts_key_myisam.result
      mysql-test/suite/parts/r/partition_max_parts_list_innodb.result
      mysql-test/suite/parts/r/partition_max_parts_list_myisam.result
      mysql-test/suite/parts/r/partition_max_parts_range_innodb.result
      mysql-test/suite/parts/r/partition_max_parts_range_myisam.result
      mysql-test/suite/parts/r/partition_max_sub_parts_key_list_innodb.result
      mysql-test/suite/parts/r/partition_max_sub_parts_key_list_myisam.result
      mysql-test/suite/parts/r/partition_max_sub_parts_key_range_innodb.result
      mysql-test/suite/parts/r/partition_max_sub_parts_key_range_myisam.result
      mysql-test/suite/parts/r/partition_max_sub_parts_list_innodb.result
      mysql-test/suite/parts/r/partition_max_sub_parts_list_myisam.result
      mysql-test/suite/parts/r/partition_max_sub_parts_range_innodb.result
      mysql-test/suite/parts/r/partition_max_sub_parts_range_myisam.result
      mysql-test/suite/parts/t/partition_max_parts_hash_innodb.test
      mysql-test/suite/parts/t/partition_max_parts_hash_myisam.test
      mysql-test/suite/parts/t/partition_max_parts_inv_innodb.test
      mysql-test/suite/parts/t/partition_max_parts_inv_myisam.test
      mysql-test/suite/parts/t/partition_max_parts_key_innodb.test
      mysql-test/suite/parts/t/partition_max_parts_key_myisam.test
      mysql-test/suite/parts/t/partition_max_parts_list_innodb.test
      mysql-test/suite/parts/t/partition_max_parts_list_myisam.test
      mysql-test/suite/parts/t/partition_max_parts_range_innodb.test
      mysql-test/suite/parts/t/partition_max_parts_range_myisam.test
      mysql-test/suite/parts/t/partition_max_sub_parts_key_list_innodb.test
      mysql-test/suite/parts/t/partition_max_sub_parts_key_list_myisam.test
      mysql-test/suite/parts/t/partition_max_sub_parts_key_range_innodb.test
      mysql-test/suite/parts/t/partition_max_sub_parts_key_range_myisam.test
      mysql-test/suite/parts/t/partition_max_sub_parts_list_innodb.test
      mysql-test/suite/parts/t/partition_max_sub_parts_list_myisam.test
      mysql-test/suite/parts/t/partition_max_sub_parts_range_innodb.test
      mysql-test/suite/parts/t/partition_max_sub_parts_range_myisam.test
 4227 mysql-builder@stripped	2012-09-04
      

 4226 Vasil Dimov	2012-09-03
      Fix Bug#14404879 UNUSUAL TABLENAMES ARE DISPLAYED BOGUSLY IN
      MYSQL.INNODB_TABLE_STATS.TABLE_NAME
      
      Convert from filename encoding (@1234) in dict_table_t::name into UTF8
      before save and fetch to/from mysql.innodb_table_stats and
      mysql.innodb_index_stats
      
      Approved by:	Marko (http://bur03.no.oracle.com/rb/r/1250/)

    modified:
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/univ.i
 4225 Allen lai	2012-09-04
      Bug#14529744 - NONDETERMINISM IN INNODB DEBUG_SYNC TESTS
      
      rb://1263 Approved b Marko
      
      Some InnoDB test cases that use DEBUG_SYNC are skipped during test
      execution, apparently because some DEBUG_SYNC tests are not properly
      cleaning up after themselves.
      First, we found all nondeterminism test cases by review all tests that
      use DEBUG_SYNC and test each of them like this:
      ./mtr --mem --repeat=100 --parallel=4 test_name{,,,}.
      Most of the problem case missed SET DEBUG_SYNC = 'RESET' to clean up
      DEBUG SYNC points, this causes problem.
      For fixing it, we added all missed SET DEBUG_SYNC = 'RESET'. Also, we
      modified these cases according to
      http://dev.mysql.com/doc/internals/en/test-synchronization.html
      and
      https://mediawiki.us.oracle.com/mysql/index.php/How_to_Create_Good_Tests.

    modified:
      mysql-test/suite/innodb/r/innodb_bug14006907.result
      mysql-test/suite/innodb/t/innodb_bug14006907.test
 4224 bjorn.munch@stripped	2012-09-03
      Raise version number after cloning 5.6.7-rc

    modified:
      VERSION
 4223 Annamalai Gurusami	2012-09-03 {clone-5.6.7-rc-build}
      This test case also must mask the maximum row size because
      of the dependency with the page size.  

    modified:
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/t/innodb_4k.test
 4222 Annamalai Gurusami	2012-09-03
      For this test case also, the maximum row size is masked because
      it depends on the page size. 

    modified:
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/t/innodb_8k.test
 4221 Annamalai Gurusami	2012-09-03 [merge]
      Merge from mysql-5.5 to mysql-5.6. 

    modified:
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
      mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
 4220 Mattias Jonsson	2012-09-01
      Bug#11755685: EXTEND LIMIT BEYOND 1024 PARTITIONS
      
      post-push fix: Updated test.

    modified:
      mysql-test/r/partition_mgm_err.result
      mysql-test/t/partition_mgm_err.test
 4219 Annamalai Gurusami	2012-09-01
      Fixing test case failure.

    modified:
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
 4218 Annamalai Gurusami	2012-09-01 [merge]
      Merge from mysql-5.5 to mysql-5.6. 

    modified:
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_misc1.result
      storage/innobase/handler/ha_innodb.cc
 4217 Mattias Jonsson	2012-09-01
      Bug#11755685: EXTEND LIMIT BEYOND 1024 PARTITIONS
      
      Extending limit to 8192 partitions.
      
      Also changing a minor performance issue with the loop
      over used partitions in scan_time.

    modified:
      sql/ha_partition.cc
      sql/sql_const.h
 4216 Marc Alff	2012-09-01
      Bug#13915200 - SET GLOBAL DEBUG CAUSES CRASHES IN DBUG.C, RACE CONDITIONS
      
      Backport from mysql-trunk to mysql-5.6

    modified:
      dbug/dbug.c
      mysys/thr_rwlock.c
 4215 Marc Alff	2012-08-31 [merge]
      Local merge

    added:
      mysql-test/r/wl6443_deprecation.result
      mysql-test/t/wl6443_deprecation-master.opt
      mysql-test/t/wl6443_deprecation.test
    modified:
      include/my_getopt.h
      mysql-test/include/system_db_struct.inc
      mysql-test/r/1st.result
      mysql-test/r/connect.result
      mysql-test/r/information_schema.result
      mysql-test/r/lock_multi.result
      mysql-test/r/log_tables_upgrade.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/not_embedded_server.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/ps.result
      mysql-test/r/show_profile.result
      mysql-test/r/system_mysql_db.result
      mysql-test/r/system_mysql_db_refs.result
      mysql-test/r/variables.result
      mysql-test/r/wl6219-upgrade.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_key_column_usage.result
      mysql-test/suite/funcs_1/r/is_statistics.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_table_constraints.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
      mysql-test/suite/perfschema/r/pfs_upgrade_event.result
      mysql-test/suite/perfschema/r/pfs_upgrade_func.result
      mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
      mysql-test/suite/perfschema/r/pfs_upgrade_table.result
      mysql-test/suite/perfschema/r/pfs_upgrade_view.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/sizing_default.result
      mysql-test/suite/perfschema/r/sizing_high.result
      mysql-test/suite/perfschema/r/sizing_low.result
      mysql-test/suite/perfschema/r/sizing_med.result
      mysql-test/suite/rpl/r/rpl_spec_variables.result
      mysql-test/suite/rpl/t/rpl_spec_variables.test
      mysql-test/suite/sys_vars/r/date_format_basic.result
      mysql-test/suite/sys_vars/r/datetime_format_basic.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
      mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
      mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
      mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
      mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
      mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
      mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
      mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
      mysql-test/suite/sys_vars/r/thread_concurrency_basic.result
      mysql-test/suite/sys_vars/r/time_format_basic.result
      mysql-test/t/lock_multi.test
      mysql-test/t/not_embedded_server.test
      mysql-test/t/profiling.test
      mysql-test/t/ps.test
      mysql-test/t/system_mysql_db_fix40123.test
      mysql-test/t/system_mysql_db_fix50030.test
      mysql-test/t/system_mysql_db_fix50117.test
      mysql-test/t/system_mysql_db_refs.test
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
      sql/item_func.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sql_acl.cc
      sql/sql_plugin.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
 4214 Marc Alff	2012-08-31
      Bug#14113704 - A STAT ON A NON EXISTING FILE CREATING A FILE RECORD IN PFS
      
      Post merge fix: do not call release_file(NULL)

    modified:
      storage/perfschema/pfs.cc
 4213 kevin.lewis@stripped	2012-08-31
      Bug #14571373 - INNODB: NEW WARNINGS ON WINDOWS IN 5.6 BRANCH
      Clean up compiler warnings
      Approved by Marko, rb:1261

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
 4212 Marc Alff	2012-08-31 [merge]
      Local merge

    modified:
      cmake/create_initial_db.cmake.in
      mysys_ssl/CMakeLists.txt
 4211 Marc Alff	2012-08-31
      Bug#14569746
      
      Improved the robustness of table performance_schema.session_connect_connect_attrs.
      Improved test coverage
      
      See the bug report for more details.

    modified:
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/connect_attrs.result
      mysql-test/suite/perfschema/r/start_server_disable_idle.result
      mysql-test/suite/perfschema/r/start_server_disable_stages.result
      mysql-test/suite/perfschema/r/start_server_disable_statements.result
      mysql-test/suite/perfschema/r/start_server_disable_waits.result
      mysql-test/suite/perfschema/r/start_server_innodb.result
      mysql-test/suite/perfschema/r/start_server_no_account.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_host.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
      mysql-test/suite/perfschema/r/start_server_no_socket_class.result
      mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
      mysql-test/suite/perfschema/r/start_server_no_stage_class.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_statement_class.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_no_user.result
      mysql-test/suite/perfschema/r/start_server_no_waits_history.result
      mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/t/connect_attrs.test
      storage/perfschema/cursor_by_thread_connect_attr.cc
      storage/perfschema/cursor_by_thread_connect_attr.h
      storage/perfschema/table_session_account_connect_attrs.cc
      storage/perfschema/table_session_account_connect_attrs.h
      storage/perfschema/table_session_connect.cc
      storage/perfschema/table_session_connect.h
 4210 Marc Alff	2012-08-31 [merge]
      Local merge

    modified:
      plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/sql_optimizer.cc
 4209 Marc Alff	2012-08-31
      Bug#14563084 
      
      Improved the robustness of table performance_schema.session_connect_attrs.
      
      See the bug report for more details.

    modified:
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
 4208 Oystein Grovlen	2012-08-31
      Bug#14499409: CRASH IN KEY_COPY() WITH ROLLUP AND LOOSESCAN SEMIJOIN
      
      GROUP BY WITH ROllUP will normally require a temporary table,
      but if grouping on a constant (e.g., GROUP BY 1), the temporary
      table is skipped and one may add sorting without a temporary
      table.  Semijoin LooseScan depends on scanning in index order
      to eliminate duplicates.  Hence, switching to use filesort
      instead will not work.
      
      Fix: If an index is not to be used for group by, force use of 
      temporary table if LooseScan is to be used.  This prevents
      sorting to be added on the same table.
     @ sql/sql_optimizer.cc
        Prevent sorting for group by without a temporary table if
        LooseScan for semijoin is to be used.

    modified:
      sql/sql_optimizer.cc
 4207 Marko Mäkelä	2012-08-31
      Bug#14220701 ONLINE SECONDARY INDEX CREATION MAY READ FREED OFF-PAGE COLUMNS
      
      This turned out to be a false alarm. The off-page columns for
      secondary index entries would already be fetched by the row_build()
      call in row_merge_read_clustered_index().
      
      innobase_online_rebuild_log_free(): Assert that the data dictionary
      cache is exclusively locked during the call.
      
      row_merge_insert_index_tuples(): Add assertions and clarify comments.
      Assert that there are no references to off-page columns in secondary
      index records.
      
      row_merge_skip_rec(): Remove (replace with direct calls to
      row_log_table_is_rollback()).
      
      row_log_table_apply_delete(): Adjust comments and formatting.
      
      row_undo_ins_parse_undo_rec(): Cleanup (code deduplication).
      
      dict_stats_table_clone_create(): Cleanup. Reset the index flags
      related to online index creation or table rebuild. The flags were
      checked in dict_stats_should_ignore_index() already.
      
      rb:1255 approved by Jimmy Yang

    modified:
      storage/innobase/dict/dict0stats.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0uins.cc
 4206 Norvald H. Ryeng	2012-08-31
      Bug#14500792 ASSERTION FAILED: (*REF)->IS_TEMPORAL(), FILE ITEM.CC,
      LINE 7581
      
      Problem: A query with GROUP BY WITH ROLLUP comparing a grouping column
      using the IN operator causes an assertion to fire.
      
      During rollup processing, Item_null_result items are generated for the
      NULL values in the rollup rows by JOIN::rollup_make_fields(). When
      comparing using the IN operator, the grouping value is represented as
      an Item_ref pointing to an Item_null_result.
      Item_ref::val_time_temporal() asserts that its ref is a temporal item
      by checking (*ref)->is_temporal(). This causes the field type to be
      checked, and is_temporal_type() defines that MYSQL_TYPE_NULL is not a
      temporal type. Therefore, the assertion fires.
      
      Fix: Add a constructor to Item_null_result that sets the field and
      result types so that they can be set to the correct type for that
      column when instantiating Item_null_result in JOIN::rollup_init() and
      JOIN::rollup_make_fields().

    modified:
      sql/item.h
      sql/sql_resolver.cc
      sql/sql_select.cc
 4205 mysql-builder@stripped	2012-08-31 [merge]
      

 4204 Nirbhay Choubey	2012-08-31
      Bug#14513708 : postfix for an affected test.

    modified:
      mysql-test/t/mysql_config_editor.test
 4203 kevin.lewis@stripped	2012-08-30
      Bug#14558324 - INNODB ASSERTION ERROR WHEN UNKNOWN OPTION ENCOUNTERED
      
      Current directory was not set to a valid folder so Windows returned
      ERROR_ACCESS_DENIED for os_file_create().  5.6 code had been changed to
      report the call stack as an assert instead of just exit(1); when an unknown
      error is returned from the OS.  So this patch uses exit(1) for non-debug builds
      and an assert for debug builds.

    modified:
      storage/innobase/os/os0file.cc
 4202 Marko Mäkelä	2012-08-30 [merge]
      Merge mysql-5.5 to mysql-5.6.

    modified:
      storage/innobase/btr/btr0btr.cc
      storage/innobase/include/page0types.h
      storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.cc
 4201 Nirbhay Choubey	2012-08-30
      Bug #14513708 .MYLOGIN.CNF SHOULD BE IGNORED IF ITS
      NOT EXCLUSIVELY READ/WRITABLE BY CURR. USER
      
      In the option handling system, the file permissions
      for login file were being checked like other option
      files.
      
      Added a check separately for login file to make sure
      that it gets ignored if its not exclusively readable/
      writable by current user. Also moved the permissions-
      checking code to a new function.
      
      Manually tested.

    modified:
      client/mysql_config_editor.cc
      mysys_ssl/my_default.cc
 4200 Vasil Dimov	2012-08-30
      Backport WL#6347 InnoDB: Index level compression stats
      from mysql-trunk into mysql-5.6

    added:
      mysql-test/suite/innodb/include/innodb_create_tab_indx.inc
      mysql-test/suite/innodb/include/innodb_fectch_records.inc
      mysql-test/suite/innodb/include/innodb_load_data.inc
      mysql-test/suite/innodb/include/innodb_stats_comp_index.inc
      mysql-test/suite/innodb/include/innodb_stats_restart.inc
      mysql-test/suite/innodb/r/innodb_cmp_per_index.result
      mysql-test/suite/innodb/r/innodb_wl6347_comp_indx_stat.result
      mysql-test/suite/innodb/t/innodb_cmp_per_index.test
      mysql-test/suite/innodb/t/innodb_wl6347_comp_indx_stat.test
      mysql-test/suite/sys_vars/r/innodb_cmp_per_index_enabled_basic.result
      mysql-test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test
    modified:
      mysql-test/r/information_schema.result
      mysql-test/r/mysqlshow.result
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/include/page0types.h
      storage/innobase/include/page0zip.h
      storage/innobase/include/page0zip.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/page/page0zip.cc
      storage/innobase/srv/srv0srv.cc
 4199 Mattias Jonsson	2012-08-30
      Bug#14247298: Failing dbug_assert in Item_in_subquery::val_int()
      
      Debug regression from WL#4443.
      
      Item_in_subselect::val_int() was called from get_mm_tree() when
      it only should be used in Item_in_optimizer.
      
      Fixed by skipping evaluation if item has subquery.

    modified:
      sql/opt_range.cc
 4198 Evgeny Potemkin	2012-08-30 [merge]
      Auto-merged.

    modified:
      plugin/semisync/semisync_master.cc
      scripts/comp_sql.c
      sql/sql_trigger.cc
      strings/ctype-uca.c
 4197 Evgeny Potemkin	2012-08-30 [merge]
      Auto-merged.

    added:
      unittest/gunit/make_sortkey-t.cc
    modified:
      include/my_base.h
      mysql-test/include/plugin.defs
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/myisam.result
      mysql-test/r/update.result
      mysql-test/suite/innodb/r/innodb-tablespace.result
      mysql-test/suite/innodb/t/innodb-blob.test
      mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test
      mysql-test/suite/innodb/t/innodb-tablespace.test
      mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/myisam.test
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
      sql/filesort.cc
      sql/filesort.h
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/opt_range.cc
      sql/rpl_master.cc
      sql/rpl_master.h
      sql/share/errmsg-utf8.txt
      sql/sql_acl.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_executor.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition_admin.cc
      sql/sql_select.cc
      sql/sql_table.cc
      sql/sql_tmp_table.cc
      sql/sql_trigger.cc
      sql/sql_truncate.cc
      sql/table_cache.cc
      storage/innobase/api/api0api.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/dict/dict0stats_bg.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0pars.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/api0api.h
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0sea.h
      storage/innobase/include/btr0types.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0dblwr.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/data0data.h
      storage/innobase/include/data0type.h
      storage/innobase/include/data0types.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/dict0types.h
      storage/innobase/include/dyn0dyn.h
      storage/innobase/include/dyn0dyn.ic
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0ast.h
      storage/innobase/include/fts0fts.h
      storage/innobase/include/fts0types.h
      storage/innobase/include/ha0ha.h
      storage/innobase/include/ha0storage.h
      storage/innobase/include/ha0storage.ic
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/hash0hash.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/ibuf0types.h
      storage/innobase/include/lock0iter.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/lock0priv.h
      storage/innobase/include/lock0types.h
      storage/innobase/include/log0log.h
      storage/innobase/include/log0recv.h
      storage/innobase/include/mem0mem.h
      storage/innobase/include/mem0pool.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0types.h
      storage/innobase/include/os0file.h
      storage/innobase/include/os0sync.h
      storage/innobase/include/page0cur.h
      storage/innobase/include/page0types.h
      storage/innobase/include/pars0pars.h
      storage/innobase/include/pars0sym.h
      storage/innobase/include/pars0types.h
      storage/innobase/include/que0que.h
      storage/innobase/include/que0types.h
      storage/innobase/include/read0read.h
      storage/innobase/include/read0types.h
      storage/innobase/include/row0ext.h
      storage/innobase/include/row0import.h
      storage/innobase/include/row0ins.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0purge.h
      storage/innobase/include/row0quiesce.h
      storage/innobase/include/row0sel.h
      storage/innobase/include/row0types.h
      storage/innobase/include/row0undo.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0arr.h
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0i_s.h
      storage/innobase/include/trx0purge.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0rseg.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0trx.ic
      storage/innobase/include/trx0types.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/usr0sess.h
      storage/innobase/include/usr0types.h
      storage/innobase/include/ut0bh.h
      storage/innobase/include/ut0dbg.h
      storage/innobase/include/ut0list.h
      storage/innobase/include/ut0lst.h
      storage/innobase/include/ut0rbt.h
      storage/innobase/include/ut0ut.h
      storage/innobase/include/ut0vec.h
      storage/innobase/include/ut0wqueue.h
      storage/innobase/lock/lock0lock.cc
      storage/innobase/mem/mem0dbg.cc
      storage/innobase/mem/mem0pool.cc
      storage/innobase/os/os0file.cc
      storage/innobase/os/os0sync.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/srv/srv0conc.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/sync/sync0arr.cc
      storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.cc
      storage/innobase/ut/ut0mem.cc
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_close.c
      storage/myisam/mi_create.c
      storage/myisam/mi_open.c
      unittest/gunit/CMakeLists.txt
 4196 Evgeny Potemkin	2012-08-29
      Bug#14348858: EXTRA ROWS IN RESULT WHEN SQL_BUFFER_RESULT IS USED WITH SUBQUERY
      AND MYISAM
      
      The join_init_read_record have to be used as a function for reading the
      first record when a table needs to be sorted. The code that sets this
      function was outside of the add_sorting_to_table function. This led to
      missing initialization in the case when the first non-const table needs to be
      sorted. In its turn this resulted in missing sorting step and filesort
      condition not being applied.
      
      Now add_sorting_to_table function also sets first record reading function
      appropriately.

    modified:
      sql/sql_select.cc
 4195 Evgeny Potemkin	2012-08-28 [merge]
      Auto-merged.

    modified:
      mysql-test/suite/perfschema/include/table_aggregate_load.inc
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_off.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
      sql/sql_lex.cc
 4194 Evgeny Potemkin	2012-08-28
      Bug#14485935: CRASH IN CREATE_REF_FOR_KEY() ON SELECT WITH JOIN AND MANY WHERE CLAUSES
      Adjusted condition, assertion and test result.

    modified:
      sql/sql_select.cc
      sql/table.cc
 4193 Evgeny Potemkin	2012-08-28 [merge]
      Auto.merged.

    modified:
      mysql-test/r/explain_json_all.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/suite/rpl/r/rpl_semi_sync.result
      mysql-test/suite/rpl/t/rpl_semi_sync.test
      mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
      mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
      plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
      sql/sql_optimizer.cc
      sql/sys_vars.cc
 4192 Evgeny Potemkin	2012-08-27 [merge]
      Auto-merged.

    modified:
      sql/table.cc
 4191 Allen lai	2012-08-27
        Bug#14221812 - ASSERT 0 IN ROW_SEL_GET_CLUST_REC_FOR_MYSQL,
      		 CLUST REC NOT FOUND FOR SEC IDX REC
      
        rb://1230 Approved by Marko
      
        This is basically address an issue that rows are skipped for primary
        index, but built into secondary index during online table rebuild.
        As bug described, row_merge_skip_rec() is called for primary index,
        but secondary index is still built. So the simple fix is to remove
        such row_merge_skip_rec() check when we insert row to index, so that
        they can be dropped altogether by online log application.
      
        However, the row_merge_skip_rec() is added mainly to address the BLOB
        issue, since BLOB can be dropped for rollback operation. To deal with
        it,we will need to log enough prefix so that any prefix index on blob
        data can be built even if the BLOB is dropped.
      
        In this implementation, we logged the row_ext_t for any such rows
        during its rollback drop, of course, only for dynamic and compressed
        table. And we will reconstruct a valid row_ext_t when we actually
        delete the entry in primary index as well as in secondary index.

    modified:
      mysql-test/suite/innodb/r/innodb-table-online.result
      mysql-test/suite/innodb/t/innodb-table-online.test
      storage/innobase/include/row0row.h
      storage/innobase/include/row0row.ic
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0row.cc
 4190 Martin Hansson	2012-08-27
      Bug#13985071: Back-port of the patch deprecating delayed insert system variables.

    modified:
      mysql-test/r/delayed.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/variables.result
      mysql-test/suite/rpl/r/rpl_bug31076.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
      mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
      mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
      mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
      mysql-test/t/delayed.test
      sql/sys_vars.cc
 4189 Nirbhay Choubey	2012-08-27
      Bug#13598383 MAIN.MYSQLDUMP TEST FAILS ON RHEL 32 BIT
      
      Comments in mysqldump's output were not getting
      printed in right order. This happened as data from
      stdout (buffered) and stderr (unbuffered) were being
      displayed together.
      
      Fixed the test by redirecting the stderr output
      of the command to a separate file.
      
      Its a modification in the existing test. No separate
      test provided.

    modified:
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
 4188 Tor Didriksen	2012-08-27
      Bug#14530242 CRASH / MEMORY CORRUPTION IN FILESORT_BUFFER::GET_RECORD_BUFFER WITH MYISAM
      
      In 5.6/trunk we have this patch:
      Bug#13340270: assertion table->sort.record_pointers == __null
      which free's a bit too much of the resources used by filesort()

    modified:
      sql/opt_range.cc
 4187 Roy Lyseng	2012-08-27 [merge]
      Merge from mysql-5.6-14272788

    modified:
      mysql-test/r/derived.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/func_analyse.result
      mysql-test/r/group_by.result
      mysql-test/r/heap.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/subquery_all.result
      mysql-test/r/subquery_all_bka.result
      mysql-test/r/subquery_all_bka_nixbnl.result
      mysql-test/r/subquery_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/filesort_pq.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/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      sql/abstract_query_plan.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
      sql/opt_range.cc
      sql/records.h
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_derived.cc
      sql/sql_executor.cc
      sql/sql_executor.h
      sql/sql_join_buffer.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_optimizer.cc
      sql/sql_optimizer.h
      sql/sql_planner.cc
      sql/sql_resolver.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_test.cc
      sql/sql_tmp_table.cc
      sql/table.cc
      sql/table.h
 4186 Hemant Kumar	2012-08-27
      Non functional changes in collection-
      -Made default.push to run with "debug-server" option
      -Removed mysql-5.6.push

    removed:
      mysql-test/collections/mysql-5.6.push
    modified:
      mysql-test/collections/default.push
 4185 mysql-builder@stripped	2012-08-27 [merge]
      

 4184 Aditya A	2012-08-27 [merge]
      [NULL merge revsion no 3954 from 5.5 to 5.6]

 4183 Aditya A	2012-08-27 [merge]
      Bug#14145950 AUTO_INCREMENT ON DOUBLE WILL FAIL ON WINDOWS
      
      Backport from mysql-5.6 the fix
      (revision-id sunny.bains@strippedozxmz7kz)
      
        Bug#13839886 - CRASH IN INNOBASE_NEXT_AUTOINC
        
        The assertion introduce in the fix for Bug#13817703 
        is too strong, a negative  number can be greater 
        than the column max value, when the column value is
        a negative number.
        
        rb://978 Approved by Jimmy Yang.
      
      rb:1236 approved by Marko Makela

    modified:
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/t/innodb-autoinc.test
      storage/innobase/handler/ha_innodb.cc
 4182 Andrei Elkin	2012-08-27
      Bug#13897025 - fixing post-push valgrind issue with rpl_relayrotate.

    modified:
      sql/rpl_rli.cc
      sql/rpl_slave.cc
 4181 Norvald H. Ryeng	2012-08-27
      Bug#14501403 CRASH IN ITEM_CACHE_STR::SAVE_IN_FIELD WITH NATURAL
      JOINS, SET, VARBINARY
      
      Regression introduced by fix for bug #13013970.
      
      Problem: Item_cache_str::save_in_field() dereferences a null pointer
      if the cached value is NULL.
      
      When the cached value is NULL, null_value is set to true and value is
      set to a null pointer. Item_cache_str::save_in_field() tries to find
      the length of the String value points to without checking for NULLs
      first. This leads to dereferencing a null pointer.
      
      Fix: Check that the value pointer is not null before trying to find
      the length of the String it points to.

    modified:
      sql/item.cc
 4180 Andrei Elkin	2012-08-27
      Bug#13897025 - fixing post-push gcov compilation issue.

    modified:
      sql/rpl_rli_pdb.cc
 4179 mysql-builder@stripped	2012-08-26
      

 4178 Hery Ramilison	2012-08-24 [merge]
      Empty version change upmerge

 4177 Andrei Elkin	2012-08-24
      Bug#13897025: post-pushes fixes to satisfy gcov build.

    modified:
      sql/rpl_rli_pdb.cc
 4176 Jimmy Yang	2012-08-24
      Fix Bug #14527245 - ASSERT MUTEX_OWN(&DICT_SYS->MUTEX) 
      DICT_TABLE_MOVE_FROM_LRU_TO_NON_LRU FTS
      
      rb://1243 approved by Sunny Bains

    modified:
      storage/innobase/fts/fts0fts.cc
      storage/innobase/include/ut0vec.ic
 4175 Jon Olav Hauglid	2012-08-24
      Bug#14530380 SERVER CRASH WHILE DROPPING A FOREIGN KEY
      
      The problem was that the server would crash inside InnoDB if
      ALTER TABLE ... DROP FOREIGN KEY was used without naming the
      fk to be dropped.
      
      This patch fixes the problem by changing the grammar so that
      specifying fk name is required - similar to what is already
      done for ALTER TABLE ... DROP KEY.

    modified:
      sql/sql_class.h
      sql/sql_yacc.yy
 4174 Andrei Elkin	2012-08-24 [merge]
      merge from 5.6 repo

 4173 Andrei Elkin	2012-08-24
      Bug#13897025 - SLAVE_PARALLEL_WORKERS DEGRADES REPLICATION PERFORMANCE
      
      The reason of degradation appeared to be two-fold.
      The load of the test report contained FK-related databases with rather
      aggressive load to them forcing MTS frequently switching to sequential
      execution which is somewhat expensive.
      The other reason turns out to be a mistake in the source code
      in resetting a multiplier to the Coordinator nap. The multiplier is computed 
      as a number of excessive events counting from a certain overrun level
      of the Worker queue. It was not reset to zero that made the multiplier grow
      over time which manifested in the observed slave execution slowdown.
      
      Fixed with correcting the nap factor computing.
      An assert is deployed to prove the correct resetting in the case of one
      Worker.
      In order to hunt over possible performance reports more statistics is made
      to printed into error log with --log-warnings=2.
     @ sql/rpl_rli.h
        changes to improve online public MTS statistics.
     @ sql/rpl_rli_pdb.cc
        initializing a new Slave_worker::overrun_level;
        renaming and re-typ wq_overrun_set to wq_overrun_cnt;
        Removing the cause of Bug13897025 artifact: weight factor 
          rli->mts_wq_excess_cnt
        to take a nap in append_item_to_jobs() is corrected to be resetable
        to zero. That happens when all Worker queue lengths drop down
        below worker->overrun_level.
        Zero length queue Worker is refined not to be considered as underruning,
        thereby such Worker presense does not affect Coordinator decision to
        take a nap.
     @ sql/rpl_rli_pdb.h
        Adding a new member to Slave_worker and renaming another one.
     @ sql/rpl_slave.cc
        Few additions for MTS public online statistics is made.

    modified:
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
 4172 Inaam Rana	2012-08-24
      Add missing tests for WL#6344 which we mistakenly not pushed with
      original patch. inaam.rana@stripped

    added:
      mysql-test/suite/sys_vars/r/innodb_compression_level_basic.result
      mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result
      mysql-test/suite/sys_vars/t/innodb_compression_level_basic.test
      mysql-test/suite/sys_vars/t/innodb_log_compressed_pages_basic.test
 4171 Rohit Kalhans	2012-08-24
      BUG#14457883: SANITARY CHECKS REQUIRED IN
      SQL_THREAD_WAIT_AFTER_GTIDS() WHEN USED
      WITHOUT REPLICATION AND BINLOG
      
      Problem: The implementation of SQL function
      sql_thread_wait_after_gtids() doesnot have proper
      sanitary check for the condition in which binlogging
      is disabled.
      
      Background: There is no sanity check if replication
      has not been setup.
      
      Fix: We implement a sanity check to make
      sql_thread_wait_after_gtids() return 'NULL' in case
      replication has not been setup. 
     @ sql/item_func.cc
        Implement sanity check for the case when replication
        has not been setup

    modified:
      sql/item_func.cc
 4170 Marko Mäkelä	2012-08-24
      Let innodb_fts_large_records.test run without --big-test.
      It is a quick test (about 3 seconds), and it has caught regressions during
      development.

    modified:
      mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test
 4169 Marko Mäkelä	2012-08-24
      Cleanup for Bug#14219624 - ALTER TABLE...ADD COL AUTO_INCREMENT DOES NOT OBEY
      AUTO_INCREMENT_OFFSET
      
      There was a slight error in the original fix, which lead to an
      assertion failure while testing rb:1230. Sunny proposed this fix.

    modified:
      storage/innobase/handler/handler0alter.cc
 4168 Marko Mäkelä	2012-08-24
      Bug#14488218 ALTER TABLE trouble with FULLTEXT INDEX
      
      In an ALTER TABLE that rebuilds a table, and in particular, ADD
      COLUMN, DROP COLUMN, there were some assertion failures related to
      fulltext indexes.
      
      innobase_create_key_defs(): Always initialize n_fts_add (make it an
      output-only parameter).
      
      prepare_inplace_alter_table_dict(): Remove the parameter
      num_fts_index. We cannot calculate it until we know if the table is to
      be rebuilt. The variable is supposed to count the number of fulltext
      indexes that will be created. In a rebuild, all indexes will be
      re-created. Otherwise, only added fulltext indexes will be
      created. Add a debug assertion and error handling to ensure that
      InnoDB never tries to execute a locking ALTER while MySQL is asking
      for non-locking (online) ALTER.
      
      ha_innobase::prepare_inplace_alter_table(): Defer the check for
      num_fts_index>1 until prepare_inplace_alter_table_dict().
      
      ha_innobase::check_if_supported_inplace_alter(): Refuse to ADD PRIMARY
      KEY online if there would be fulltext indexes in the new table, or if
      the table contains a hidden FTS_DOC_ID column (there used to be
      fulltext indexes).
      
      rb:1228 approved by Jimmy Yang

    modified:
      sql/handler.h
      sql/sql_table.cc
      storage/innobase/handler/handler0alter.cc
 4167 viswanatham gudipati	2012-08-24
      Fixed the problem of sporadic failure and checked the results in mysql-trunk
      no issues are found.

    added:
      mysql-test/suite/innodb/r/innodb_crash_recov_log_compressed_after_commit_0.result
      mysql-test/suite/innodb/r/innodb_crash_recov_log_compressed_after_commit_1.result
      mysql-test/suite/innodb/r/innodb_crash_recov_log_compressed_before_commit_0.result
      mysql-test/suite/innodb/r/innodb_crash_recov_log_compressed_before_commit_1.result
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_after_commit_0.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_after_commit_1.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_before_commit_0.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_before_commit_1.test
 4166 Martin Hansson	2012-08-24 [merge]
      Bug#14498355: Merge

    modified:
      mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
      mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
      sql/set_var.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/sql_plugin.cc
      sql/sys_vars.h
 4165 Ashish Agarwal	2012-08-24 [merge]
      Bug#14363985: Merge from mysql-5.5 to mysql-5.6

    modified:
      sql/sql_plugin.cc
 4164 Jorgen Loland	2012-08-24
      BUG#14497598: INCORRECT RANGE CONSTRUCTION FOR COMPLEX CONDITION
      
      Range optimizer: It is possible that a SEL_TREE contains both
      a) simple range predicates (in tree->keys[]) and
      b) index merge range predicates (in tree->merges)
      
      If a tree has both, they represent equally *valid* range
      predicate alternatives; both will return all relevant rows 
      from the table but one may return more unnecessary rows than
      the other. tree_or() was not up for the task of merging 
      such complex trees. The fix is to remove the index 
      merge predicates (if we have both types) before OR'ing the 
      trees. 
      
      For future reference: It is possible to tree_or such 
      SEL_TREEs, it's just not prioritized ATM.

    modified:
      sql/opt_range.cc
 4163 Marc Alff	2012-08-24 [merge]
      NULL MERGE mysql-5.5 --> mysql-5.6

 4162 Alexander Nozdrin	2012-08-24
      Patch for Bug#14483430 (RECONSIDER MYSQL 5.6.6 BIND-ADDRESS BEHAVIOUR
      WHEN CONFIGURED AS DEFAULT *).
      
      The bug was introduced by WL#6301 (Change default value for the 'bind-address' option).
      
      The user visible problem was that the server didn't start with the default value
      of bind-address, which is '*'. The star means that the server should choose
      '::' or '0.0.0.0' depending on whether IPv6 is available on the box or not.
      
      The IPv6 detection was implemented by calling getaddrinfo() for the IPv6-address.
      It turned out, it is not enough -- getaddrinfo() might successfully return, but later
      OS failed to create an IPv6-socket. This problem is platform dependent
      (reproduced on CentOS 5.2).
      
      The fix is to make the check more strict -- try to create a dummy IPv6-socket
      after getaddrinfo() succeeds.
      
      No test case for the bug since it is platform specific.

    modified:
      sql/mysqld.cc
 4161 Gopal Shankar	2012-08-24 [merge]
      Merge for Bug#14364558 from mysql-5.5

    modified:
      sql/sql_base.cc
 4160 Marc Alff	2012-08-23 [merge]
      Local merge

    modified:
      sql/item.h
      sql/sql_select.cc
 4159 Marc Alff	2012-08-23
      Bug#13984150 - PERFSCHEMA.PFS_UPGRADE TEST FAILS WITH "UPGRADE FAILED"
      MAINLY IN GCOV
      
      Before this fix, the test pfs_upgrade would test different upgrade cases
      involving:
      - a table
      - a view
      - a stored procedure
      - a stored function
      - an event
      in the same script, which resulted in 5 execution of mysql_upgrade.
      
      The problem was that, when doing special builds involving time consuming
      instrumentation (valgrind builds, gcov builds), and given that mysql_upgrade
      is an long operation, the test script did time out and fail.
      
      The fix is to split this long test in smaller peices,
      to avoid time outs and improve manageability.
      
      This fix is a test script fix only, no server code was changed.

    removed:
      mysql-test/suite/perfschema/include/pfs_upgrade.inc
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/t/pfs_upgrade.test
    added:
      mysql-test/suite/perfschema/r/pfs_upgrade_event.result
      mysql-test/suite/perfschema/r/pfs_upgrade_func.result
      mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
      mysql-test/suite/perfschema/r/pfs_upgrade_table.result
      mysql-test/suite/perfschema/r/pfs_upgrade_view.result
      mysql-test/suite/perfschema/t/pfs_upgrade_event.test
      mysql-test/suite/perfschema/t/pfs_upgrade_func.test
      mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
      mysql-test/suite/perfschema/t/pfs_upgrade_table.test
      mysql-test/suite/perfschema/t/pfs_upgrade_view.test
 4158 Inaam Rana	2012-08-23
      WL#6344 Make compression level and logging of compressed pages configurable
      
      Backport from trunk:inaam.rana@stripped20726094441-lrqs0hi6dy629713
      
      The following test cases which were part of the original push to trunk
      but were not directly related to the WL are not backported in this
      push and will be pushed separately.
      
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_after_commit_0.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_after_commit_1.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_before_commit_0.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_before_commit_1.test

    modified:
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/page0zip.h
      storage/innobase/include/page0zip.ic
      storage/innobase/log/log0recv.cc
      storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.cc
      storage/innobase/page/page0zip.cc
 4157 Inaam Rana	2012-08-23
      WL#6345 Dynamic padding to reduce compression failure rate
      
      Backport from trunk: inaam.rana@stripped718170534-2hjbgq5leo7zx0xk

    added:
      mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result
      mysql-test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result
      mysql-test/suite/sys_vars/t/innodb_compression_failure_threshold_pct_basic.test
      mysql-test/suite/sys_vars/t/innodb_compression_pad_pct_max_basic.test
    modified:
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0mem.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/srv0mon.h
      storage/innobase/include/sync0sync.h
      storage/innobase/page/page0zip.cc
      storage/innobase/srv/srv0mon.cc
 4156 Nuno Carvalho	2012-08-23
      BUG#14116526: RPL.RPL_GTID_SQL_UNTIL_BEFORE_AFTER FAILS WITH RESULT LENGTH MISMATCH ON TRUNK.
      
      Changed rpl_gtid_sql_until_before_after test case to use assertions
      instead of result listing, this way if test fails all servers' state
      will be logged.
      Removed unneeded disable_query_log command.

    modified:
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
 4155 Georgi Kodinov	2012-08-23 [merge]
      merge

    modified:
      mysys_ssl/my_getopt.cc
 4154 Tor Didriksen	2012-08-23
      Bug#12762891 SSL.CMAKE FILE IS BROKEN WHEN USING CUSTOM OPENSSL BUILD
      Bug#14167227 CMAKE SHOULD REJECT -DWITH_SSL=SYSTEM IF OPENSSL IS OLDER THAN 1.0.0
      
      Added functionality to use custom installation of openssl.
      # - a custom installation of openssl can be used like this
      #     - cmake -DCMAKE_PREFIX_PATH=</path/to/custom/openssl> -DWITH_SSL="system"
      #   or
      #     - cmake -DWITH_SSL=</path/to/custom/openssl>

    modified:
      cmake/ssl.cmake
      mysys_ssl/crypt_genhash_impl.cc
      sql-common/client_authentication.cc
      storage/perfschema/unittest/CMakeLists.txt
 4153 Jon Olav Hauglid	2012-08-23
      Bug#13945257 NEW COMPILATION ERRORS/WARNINGS WITH XCODE 4.3.2
      
      Follow-up patch: Fix 3 additional warnings reported by Clang 4.0 / XCode 4.4.1

    modified:
      sql/item_subselect.cc
      sql/log_event.cc
      storage/innobase/trx/trx0trx.cc
 4152 Marko Mäkelä	2012-08-23
      Bug#14529475 INNODB.INNODB_BUG13867871 FAILS DUE TO QUERY REAP SUCCEEDED
      
      Allow the nondeterminism for now. This needs to be investigated later.

    modified:
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/t/innodb_bug13867871.test
 4151 Olav Sandstaa	2012-08-23
      Fix for Bug#11757108 CHANGE IN EXECUTION PLAN FOR COUNT_DISTINCT_GROUP_ON_KEY
                           CAUSES PEFORMANCE REGRESSION
      
      The cause for the performance regression is that the access strategy for the
      GROUP BY query is changed form using "index scan" in mysql-5.1 to use "loose
      index scan" in mysql-5.5. The index used for group by is unique and thus each
      "loose scan" group will only contain one record. Since loose scan needs to
      re-position on each "loose scan" group this query will do a re-position for
      each index entry. Compared to just reading the next index entry as a normal
      index scan does, the use of loose scan for this query becomes more expensive.
      
      The cause for selecting to use loose scan for this query is that in the current
      code when the size of the "loose scan" group is one, the formula for
      calculting the cost estimates becomes almost identical to the cost of using
      normal index scan. Differences in use of integer versus floating point aritmetic
      can cause one or the other access strategy to be selected.
      
      The main issue with the formula for estimating the cost of using loose scan is
      that it does not take into account that it is more costly to do a re-position
      for each "loose scan" group compared to just reading the next index entry.
      Both index scan and loose scan estimates the cpu cost as:
      
        "number of entries needed too read/scan" * ROW_EVALUATE_COST
      
      The results from testing with the query in this bug indicates that the real
      cost for doing re-position four to eight times higher than just reading the
      next index entry. Thus, the cpu cost estimate for loose scan should be increased.
      To account for the extra work to re-position in the index we increase the
      cost for loose index scan to include the cost of navigating the index. 
      This is modelled as a function of the height of the b-tree:
      
        navigation cost= ceil(log(records in table)/log(indexes per block))
                       * ROWID_COMPARE_COST;
      
      This will avoid loose index scan being used for indexes where the "loose scan" 
      group contains very few index entries.
     @ mysql-test/include/explain_json.inc
        Adjustment due to fix for Bug#11757108: Increase the number of records in
        table to avoid change in query plan from loose index scan to index scan.
     @ mysql-test/r/distinct.result
        Adjustment due to fix for Bug#11757108: Change in plan from using loose
        scan to index scan due to estimated loose index scan group has only one
        member. With this change, the cost of using loose index scan becomes larger
        than using index scan.
     @ mysql-test/r/explain_json_all.result
        After fix for Bug#11757108: Increase the number of records in table to
        avoid change in query plan from loose index scan to index scan.
     @ mysql-test/r/explain_json_none.result
        After fix for Bug#11757108: Increase the number of records in table to
        avoid change in query plan from loose index scan to index scan.
     @ mysql-test/r/func_group_innodb_16k.result
        Adjustment due to fix for Bug#11757108: Increase the number of records
        in table to avoid change in query plan from loose index scan to index scan.
     @ mysql-test/r/group_by.result
        Adjustment due to fix for Bug#11757108:
        1. Change in plan from using loose scan to index scan due to estimated
           loose index scan group has only one member. With this change, the cost of
           using loose index scan becomes large than using index scan.
        2. Test case for bug 11761078: Increase the number of records in table
           to avoid change in query plan.
        3. Test case for bug 12640437: Increase the number of records in table
           to avoid change in query plan.
     @ mysql-test/r/group_min_max.result
        Adjustment due to fix for Bug#11757108:
        1. Multiple explain changes caused by loose index scan becomming more
           costly than a complete table scan. In order to preserve orignal
           query plan, the record size is increased so that the cost of doing
           a table scan is increased.
        2. Test case for Bug 18068: Change in plan from using loose scan to
           index scan due to estimated loose index scan group has only one
           member. With this change, the cost of using loose index scan
           becomes large than using index scan.
        3. Test case for Bug 45386: Increase the number of records in table
           to avoid change in query plan.
     @ mysql-test/suite/opt_trace/r/range_no_prot.result
        Adjustment due to fix for Bug#11757108: Updated cost numbers due changes
        in cost estimates for loose index scan. Change in one plan from using
        loose index scan to using a normal index scan. This is ok since this test
        was for testing tracing of a change from "ref" to "range" access which
        the test still does.
     @ mysql-test/suite/opt_trace/r/range_ps_prot.result
        Adjustment due to fix for Bug#11757108: Updated cost numbers due changes
        in cost estimates for loose index scan. Change in one plan from using
        loose index scan to using a normal index scan. This is ok since this test
        was for testing tracing of a change from "ref" to "range" access which
        the test still does.
     @ mysql-test/t/func_group_innodb_16k.test
        Adjustment due to fix for Bug#11757108: Increase the number of records in
        table to avoid change in query plan.
     @ mysql-test/t/group_by.test
        Adjustment due to fix for Bug#11757108:
        1. Test case for bug 11761078: Increase the number of records in table
           to avoid change in query plan.
        2. Test case for bug 12640437: Increase the number of records in table
           to avoid change in query plan.
     @ mysql-test/t/group_min_max.test
        Adjustment due to fix for Bug#11757108:
        1. Multiple explain changes caused by loose index scan becomming more
           costly than a complete table scan. In order to preserve orignal
           query plan, the record size is increased so that the cost of doing
           a table scan is increased.
        2. Test case for Bug 45386: Increase the number of records in table
           to avoid change in query plan.
     @ sql/opt_range.cc
        Bug#11757108: Adjust the cost estimate for loose scan to take into account
        that re-position in the index is more expensive than just reading the next
        index entry. This cost estimate is used for comparing the cost of using
        loose index scan against the cost of a normal index scan (or table scan).

    modified:
      mysql-test/include/explain_json.inc
      mysql-test/r/distinct.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      mysql-test/r/func_group_innodb_16k.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/t/func_group_innodb_16k.test
      mysql-test/t/group_by.test
      mysql-test/t/group_min_max.test
      sql/opt_range.cc
 4150 Norvald H. Ryeng	2012-08-23
      Bug#14287539 CRASH (ASSERT) IN CREATE_SORT_INDEX WHEN USING
      SQL_BIG_RESULT ON JOIN QUERY
      
      Problem: An assertion fires for some queries with JOIN and the
      SQL_BIG_RESULT hint.
      
      Tables that are accessed in a way that guarantees they will return
      zero or one rows may be treated as constants. If the join condition
      contains references to such tables, the optimizer may deduce that
      further tables can be treated as constants and hence change the join
      type from JT_REF to JT_CONST in create_ref_for_key(). At this point,
      however, it is too late to move the JOIN_TAB to the head of the list
      and increment JOIN::const_tables.
      
      Due to this, the executor will enter create_sort_index() for this
      table, but since the join type has been changed from JT_REF to
      JT_CONST, an assertion fires.
      
      The assertion, and this bug, was introduced by
      revid:evgeny.potemkin@stripped as
      part of WL#6071.
      
      Fix: In JOIN::make_tmp_tables_info(), skip sorting if join_type is
      JT_CONST.

    modified:
      sql/sql_select.cc
 4149 Dmitry Lenev	2012-08-22
      Fix for bug #14404635  "ASSERTION `!MAYBE_NULL == !KEY_INFO[*ADD].
      KEY_PART[KEY_PART]. FIELD->REAL_MAYBE_".
      
      Attempt to add an index on InnoDB table and change nullability of
      column participating in this index in the same ALTER TABLE led to
      assertion failure.
      
      The assert was firing because code in innobase_create_key_defs()
      assumed that information about nullability of column in
      KEY_PART_INFO object for a column in new index is consistent
      with a state of Field object for the same column referenced by
      KEY_PART_INFO::field member. This was not true in general case
      since for columns which existed in table before ALTER
      KEY_PART_INFO::field member pointed to Field object respresenting
      old, unchanged version of column. While other information in
      KEY_PART_INFO corresponds to new version of column, with changes
      taken into account.
      
      This patch fixes the problem by changing code to always store in
      KEY_PART_INFO::field pointers to Field object which correspond to
      new version of columns.
      Unfortunately, InnoDB's code responsible for reporting duplicate
      key errors during in-place ALTER TABLE relied on old behavior, i.e.
      that KEY_PART_INFO::field contained Field object which was bound to
      TABLE::record[] for old version of table.
      So this patch also changes InnoDB code for in-place ALTER TABLE to
      use record buffer for new version of table for duplicate key
      reporting.

    modified:
      mysql-test/suite/innodb/r/innodb-index-online-fk.result
      mysql-test/suite/innodb/t/innodb-index-online-fk.test
      sql/handler.cc
      sql/handler.h
      sql/sql_table.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/data0data.h
      storage/innobase/include/data0data.ic
      storage/innobase/include/handler0alter.h
      storage/innobase/include/rem0cmp.h
      storage/innobase/rem/rem0cmp.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
 4148 Alexander Barkov	2012-08-22
      Bug#14468106 READ OF FREED MEMORY WITH GROUP_CONCAT ON GEOMETRY VALUES
      
      Problem: Field_geom (which is a Field_blob child) did not use
      table->blob_storage - a memory helper storage previously added into Field_blob,
      to handle "GROUP_CONCAT with DISTINCT or ORDER BY" properly.
      
      Fix:
      - Moving table->blob_storage related code into a separate private
        method Field_blob::store_to_mem().
      
      - Moving Field_blob and Field_geom specific code into a new private
        virtual methods Field_blob::store_internal() and Field_geom::store_internal().
      
      - Rewriting Field_blob::store(), so now it shares the common code
        between Field_blob and Field_geom, to handle empty strings and
        table->blob_storage operations, and then calls the specific code
        from store_internal().
      
      - An additional helper protected  method Field_blob::store_ptr_and_length()
        was added, to avoid a few duplicate code pieces in Field_blob and
        Field_geom.

    modified:
      sql/field.cc
      sql/field.h
 4147 Norvald H. Ryeng	2012-08-22
      Bug#14209318 ASSERTION FAILED: !TABLES ||
      THD->LEX->IS_QUERY_TABLES_LOCKED(), FILE SQL_OPTIMI
      
      Problem: Some queries with a HAVING clause with a function that refers
      to a function in the WHERE list with a subquery as parameter cause an
      assertion to be fired.
      
      Item_row::fix_fields does not update with_subselect, so if a subquery
      is wrapped in an Item_row, with_subselect and has_subquery() will be
      false for all Items further up in the tree.
      
      To find out if an item is constant or not, Item::const_item() checks
      can_be_evaluated_now(), which again checks has_subquery(). Since
      Item_row::has_subquery() returns an incorrect answer, items may be
      taken to be constant when they are not. This may lead to evaluating an
      item during resolving, even if the item is not ready to be evaluated
      yet.
      
      Fix: Set with_subselect in Item_row::fix_fields().

    modified:
      sql/item_row.cc
 4146 Jimmy Yang	2012-08-22
      Fix Bug 14252821 - OPTIMIZE INNODB MEMCACHED WITH BIN-LOG ENABLED
      
      rb://1180 approved by Sunny Bains

    added:
      mysql-test/suite/sys_vars/r/innodb_api_bk_commit_interval_basic.result
      mysql-test/suite/sys_vars/t/innodb_api_bk_commit_interval_basic.test
    modified:
      plugin/innodb_memcached/CMakeLists.txt
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
      plugin/innodb_memcached/daemon_memcached/include/memcached/engine.h
      plugin/innodb_memcached/innodb_memcache/include/handler_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
      plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
      sql/binlog.cc
      sql/mysqld.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      storage/innobase/api/api0api.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/api0api.h
      storage/innobase/include/api0misc.h
      support-files/mysql.spec.sh
 4145 Manish Kumar	2012-08-22
      BUG#14259744 - RPL.RPL_PACKET TEST FAILS ON PB2 AFTER WL#5924 CHANGES
      
      Problem : The basic reason for the failure was the change in the connection 
                attributes introduced as a part of WL#5924. The lenght of packet 
                with information that was sent over when a client's connected to 
                the server was changed as a part of this worklog. 
                But the packet information that is sent across from the client 
                to the server is of greater length in case of windows compared to the 
                information sent in case of linux which was caused due to the 
                WL5924 implementation.
      
                This is because apart from the all the common information was added
                on the client connect string (WL5924) we also have few extra 
                parameters specifically for windows platform :
      
                Only on windows:
                    _command_line : the process command line
                    _thread : the calling thread id from GetCurrentThreadId()
      
                In this test the value of max_allowed_packet is reduced when the 
                server starts using the option passed in the .opt file. So when 
                mysqltest tries to connect to the server, on windows the client 
                information that is sent exceeds the max_allowed_packet of the 
                server which causes the failure.
      
      Fix : The problem is fixed by appropriately modifying the max_allowed_packet of
            two servers and modifying the test accordingly.
     @ mysql-test/suite/rpl/r/rpl_packet.result
        Updated the result file to reflect the changes introduced.
     @ mysql-test/suite/rpl/t/rpl_packet-master.opt
        Modified the max_allowed_packet and slave_max_allowed_packet of
        of the initial master server.
     @ mysql-test/suite/rpl/t/rpl_packet-slave.opt
        Modified the max_allowed_packet and slave_max_allowed_packet of
        of the initial slave server.
     @ mysql-test/suite/rpl/t/rpl_packet.test
        The test is modified by sending a bigger packet from the
        master to the slave.

    modified:
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/t/rpl_packet-master.opt
      mysql-test/suite/rpl/t/rpl_packet-slave.opt
      mysql-test/suite/rpl/t/rpl_packet.test
 4144 mysql-builder@oracle.com	2012-08-22
      

 4143 mysql-builder@strippedom	2012-08-22
      

 4142 Marko Mäkelä	2012-08-22
      Bug#14509077 INNODB.INNODB_BUG13867871 TEST FAILURE
      
      The test was not deterministic. Ensure with wait_condition.inc that
      all DEBUG_SYNC points are actually being reached. Additionally, the
      nondeterminism of the test revealed one bug:
      
      ha_innobase::commit_inplace_alter_table(): X-lock the table before
      committing the changes. In this way, the table definition cannot be
      changed while there exist transactions that hold locks on the table,
      for example, due to FOREIGN KEY checks that are not covered by MySQL
      meta-data locks.
      
      rb:1235 approved by Jimmy Yang

    modified:
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/t/innodb_bug13867871.test
      storage/innobase/handler/handler0alter.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0upd.cc
 4141 Rohit Kalhans	2012-08-22
      BUG#14390948:
      Problem: The following assert 
      mts_assigned_partitions[i]->usage > 0 fails sporadically.
      
      Background: There is a race condition when the Coordinator
      thread (C) and the worker thread(W) access the member usage
      e.g. in the following example.
      C-> lock() usage++; unlock();
      W-> lock() usage--; unlock();
      C-> assert(usage>0);
      This causes a race and the last assert fails.
      
      Solution: We fix this problem by modifying the assert
      to usage >= 0 
     @ sql/log_event.cc
        Removed an unwanted assert.
     @ sql/rpl_rli_pdb.h
        Added comment to make the significance of the member usage clear.

    modified:
      sql/log_event.cc
      sql/rpl_rli_pdb.h
 4140 kevin.lewis@stripped	2012-08-21
      Bug #13450566-UPDATING 16M BLOB CAUSES TOO MANY RECURSIVE X-LOCKS
      
      This changes the way rw-locks keep track of recursive write or
      x-locks by decrementing recursive x-locks by 1 instead of
      X_LOCK_DECR (0x00100000).  But this decrement by 1 only happens
      with the third x-lock by the same thread, which is the second
      recursive x-lock.
      
      Instead of subtracting X_LOCK_DECR for every recursive lock, this
      patch subtracts it once for the initial x-lock, once for the first
      recursive x-lock, and by just 1 thereafter.  So now the ranges for
      lock_word are like this this;
      
      X_LOCK_DECR   = not locked
      1 to X_LOCK_DECR-1
                    = s-locked by X_LOCK_DECR-n threads
      0             = x-locked once
      -X_LOCK_DECR+1 to -1
                    = reserved by an x-locking thread but still has s-locks
      -(2*X_LOCK_DECR) to -X_LOCK_DECR
                    = recursively x-locked by a single thread
      
      Only the last range listed above has changed.  The rest are the same
      as before.

    modified:
      storage/innobase/include/sync0rw.ic
      storage/innobase/sync/sync0rw.cc
 4139 Georgi Kodinov	2012-08-16
      Bug #14503692: -SSL-CRL AND --SSL-CRLPATH HAVE A WRONG OPTION ID
      
      Fixed the ids of the command line options to use the correct option ids.

    modified:
      include/sslopt-longopts.h
 4138 Jimmy Yang	2012-08-21
      Fix Bug #14156259 - BROKEN ERROR HANDLING IN ALTER TABLE...ADD FOREIGN
            
      rb://1119 Approved by Marko

    modified:
      mysql-test/suite/innodb/r/innodb-index-online-fk.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index-online-fk.test
      mysql-test/suite/innodb/t/innodb-index.test
      storage/innobase/dict/dict0dict.cc
      storage/innobase/handler/handler0alter.cc
 4137 Nuno Carvalho	2012-08-21
      BUG#14116526: RPL.RPL_GTID_SQL_UNTIL_BEFORE_AFTER FAILS WITH RESULT LENGTH MISMATCH ON TRUNK.
      
      rpl_gtid_sql_until_before_after has sporadic failures on pb2 on valgrind
      runs. On slow/overloaded platforms SQL_THREAD_WAIT_AFTER_GTIDS may
      timeout before reaching the condition, which query result is not being
      logged due to nondeterministic return value.
      
      To avoid SQL_THREAD_WAIT_AFTER_GTIDS returns before reaching the
      condition, disabled timeout from SQL_THREAD_WAIT_AFTER_GTIDS query.

    modified:
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
 4136 Manish Kumar	2012-08-21
      BUG#14381701 - DELETING FROM A HASH WHILE ITERATING OVER IT IS WRONG
      
      Problem - The problem is that in sql/rpl_rli_pdb.cc file we delete
                from a hash while iterating over it. This is wrong since 
                delete operation might rearrange elements in hash, 
                so "iterator" will become invalid and, unless extra steps
                are taken, such iteration is likely to miss elements which 
                should have been deleted otherwise.
      
      Fix - The problem is fixed by storing the address of the Hash elements 
            that needs to be deleted based on the usage, in the Dynamic array
            of pointers in a for loop. In a second iteration we pop the 
            elements of the dynamic array and delete the Hash element from 
            that address. This will not cause any inconsistency.
     @ sql/rpl_rli_pdb.cc
        Added the new Dynamic array " hash_element "  which is used to store the
        hash entries that need to be deleted.

    modified:
      sql/rpl_rli_pdb.cc
 4135 Marko Mäkelä	2012-08-21 [merge]
      Merge mysql-5.5 to mysql-5.6.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/row/row0ins.cc
 4134 Norvald H. Ryeng	2012-08-21 [merge]
      Local merge.

    modified:
      mysql-test/r/explain.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      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_subselect.cc
      sql/item_subselect.h
      sql/sql_class.cc
      sql/sql_class.h
 4133 Nirbhay Choubey	2012-08-21
      Bug#14458293 WRITE PASSED END OF BUFFER IN
          VALIDATE_DICTIONARY_CHECK
      
      Post-fix : PB2 build failures.

    modified:
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_ftparser.h.pp
      include/mysql/service_mysql_string.h
      sql/string_service.cc
 4132 mysql-builder@stripped	2012-08-21
      

 4131 Manish Kumar	2012-08-21
      BUG#14267128 - BINLOG GROUP COMMIT COMPLETELY LOSES XA TRANSACTION BINLOGGING.
      
      Problem - XA transaction is not binlogged after the changes made in the replication 
                code for the binlog group commit. Due to this XA events were getting lost.
      
      Fix - The earlier behavior of logging the XA events in the binlog is restored.

    modified:
      sql/transaction.cc
 4130 Inaam Rana	2012-08-20
      Bug#11754304 INNODB CALLS FSYNC FOR WRITES WITH INNODB_FLUSH_METHOD=O_DIRECT
      
      rb://1226
      approved by: Sunny Bains
      
      Add a new possible value O_DIRECT_NO_FSYNC to innodb_flush_method.
      This value will implies that the user wants to use O_DIRECT with
      no fsync() which is different from existing O_DIRECT which means
      use O_DIRECT but also call fsync() to cover unknown/unexpected
      behaviour of FS.

    modified:
      storage/innobase/fil/fil0fil.cc
      storage/innobase/include/srv0srv.h
      storage/innobase/os/os0file.cc
      storage/innobase/srv/srv0start.cc
 4129 Nirbhay Choubey	2012-08-20
      Bug#14458293 WRITE PASSED END OF BUFFER IN
      VALIDATE_DICTIONARY_CHECK
      
      This patch adds an extra parameter to
      mysql_string_convert_to_char_ptr() service
      API to take [IN] maximum length of the OUT
      buffer. (buffer_length)
      
      Triggered by this change, password_validation
      plugin now sends MAX_PASSWORD_LENGTH to this
      API, which in turn makes sure that a byte is
      always available for storage of the terminating
      '\0'. Also, modified all affected ABI files
      accordingly.
      
      Added a test case & verified with Valgrind.

    modified:
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_ftparser.h.pp
      include/mysql/service_mysql_string.h
      plugin/password_validation/validate_password.cc
      sql/string_service.cc
 4128 Marko Mäkelä	2012-08-20 [merge]
      Merge mysql-5.6 to local working copy.

    modified:
      sql/ha_partition.cc
      sql/ha_partition.h
 4127 Marko Mäkelä	2012-08-20
      Bug#14389788 INNODB: NEW WARNINGS ON WINDOWS
      
      row_merge_read_clustered_index(): Add some explicit type casts.
      There should be no loss of precision possible, because the auto-increment
      values use a granularity of 1 and they should be limited to the maximum
      value that can be accurately represented in floating-point format.

    modified:
      storage/innobase/row/row0merge.cc
 4126 Marc Alff	2012-08-20
      Fixed build warning: unused variable

    modified:
      storage/perfschema/pfs.cc
 4125 Marc Alff	2012-08-20 [merge]
      Local merge

    modified:
      sql/rpl_info_factory.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
 4124 Marc Alff	2012-08-20
      Fixed code review comments, to avoid code duplication.

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/unittest/pfs_instr-t.cc
 4123 Marc Alff	2012-08-20 [merge]
      Local merge

    removed:
      extra/yassl/taocrypt/src/crypto.cpp
    added:
      packaging/WiX/mysql_server_extra.wxs.in
    renamed:
      mysql-test/suite/sys_vars/r/innodb_max_io_capacity_basic.result => mysql-test/suite/sys_vars/r/innodb_io_capacity_max_basic.result
      mysql-test/suite/sys_vars/t/innodb_max_io_capacity_basic.test => mysql-test/suite/sys_vars/t/innodb_io_capacity_max_basic.test
      sql-common/crypt_genhash_impl.cc => mysys_ssl/crypt_genhash_impl.cc
    modified:
      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/libutils.cmake
      extra/innochecksum.cc
      extra/perror.c
      extra/yassl/src/ssl.cpp
      include/mysql_com.h
      include/welcome_copyright_notice.h
      libmysql/CMakeLists.txt
      libmysqld/CMakeLists.txt
      mysql-test/include/index_merge1.inc
      mysql-test/r/index_merge_myisam.result
      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
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_key_column_usage.result
      mysql-test/suite/funcs_1/r/is_statistics.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
      mysql-test/suite/innodb/r/innodb-alter-autoinc.result
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb_bug-13628249.result
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/t/innodb-alter-autoinc.test
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb_bug-13628249.test
      mysql-test/suite/innodb/t/innodb_bug13867871.test
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
      mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/rpl/r/rpl_alter_repository.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_row_crash_safe.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_stm_mixed_crash_safe.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/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_incident-master.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_row_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_row_mts_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe-slave.opt
      mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
      mysql-test/suite/sys_vars/r/master_info_repository_basic.result
      mysql-test/suite/sys_vars/r/relay_log_info_repository_basic.result
      mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
      mysql-test/suite/sys_vars/t/master_info_repository_basic.test
      mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test
      mysql-test/t/openssl_1.test
      mysys_ssl/CMakeLists.txt
      packaging/WiX/CMakeLists.txt
      packaging/WiX/mysql_server.wxs.in
      scripts/mysql_system_tables.sql
      scripts/mysqlhotcopy.sh
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/field.cc
      sql/field.h
      sql/gcalc_tools.cc
      sql/gen_lex_hash.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/log_event.h
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_explain_json.cc
      sql/opt_range.cc
      sql/rpl_info.cc
      sql/rpl_info.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_info_table_access.cc
      sql/rpl_info_table_access.h
      sql/rpl_info_values.h
      sql/rpl_master.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
      sql/sql_array.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_executor.cc
      sql/sql_optimizer.cc
      sql/sql_optimizer.h
      sql/sql_prepare.cc
      sql/sql_resolver.cc
      sql/sql_select.cc
      sql/sql_table.cc
      sql/sys_vars.cc
      sql/table.cc
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0pcur.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/buf0dblwr.h
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/handler0alter.h
      storage/innobase/include/mach0data.h
      storage/innobase/include/mach0data.ic
      storage/innobase/include/os0file.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/srv0srv.h
      storage/innobase/os/os0file.cc
      storage/innobase/page/page0page.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/trx/trx0rec.cc
      storage/perfschema/gen_pfs_lex_token.cc
      unittest/gunit/bounds_checked_array-t.cc
      unittest/gunit/item-t.cc
      unittest/gunit/mdl-t.cc
      vio/viosslfactories.c
      mysql-test/suite/sys_vars/r/innodb_io_capacity_max_basic.result
      mysql-test/suite/sys_vars/t/innodb_io_capacity_max_basic.test

Diff too large for email (127213 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (mysql-re_ww_grp:4123 to 4229) MySQL Release Engineering15 Oct