Merge lp:~laurynas-biveinis/percona-server/5.6-merge-1 into lp:percona-server/5.6
Status: | Merged |
---|---|
Approved by: | Alexey Kopytov on 2013-05-21 |
Approved revision: | 325 |
Merged at revision: | 349 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/5.6-merge-1 |
Merge into: | lp:percona-server/5.6 |
Diff against target: |
60833 lines (+35068/-6890) 650 files modified
.bzrignore (+0/-1) COPYING.innodb-deadlock-count-patch (+0/-30) COPYING.show_temp_51 (+0/-13) Makefile (+0/-78) Percona-Server/CMakeLists.txt (+7/-0) Percona-Server/client/CMakeLists.txt (+2/-1) Percona-Server/client/client_priv.h (+3/-0) Percona-Server/client/mysql.cc (+55/-1) Percona-Server/client/mysqldump.c (+7/-3) Percona-Server/client/sql_string.cc (+44/-0) Percona-Server/client/sql_string.h (+10/-0) Percona-Server/cmake/dtrace.cmake (+1/-1) Percona-Server/cmake/install_layout.cmake (+2/-2) Percona-Server/config.h.cmake (+1/-1) Percona-Server/extra/comp_err.c (+130/-49) Percona-Server/extra/innochecksum.cc (+76/-2) Percona-Server/include/atomic/x86-gcc.h (+12/-16) Percona-Server/include/heap.h (+69/-12) Percona-Server/include/m_string.h (+40/-0) Percona-Server/include/my_getopt.h (+18/-0) Percona-Server/include/my_sys.h (+11/-9) Percona-Server/include/mysql/plugin.h (+22/-0) Percona-Server/include/mysql/plugin_audit.h.pp (+13/-0) Percona-Server/include/mysql/plugin_auth.h.pp (+13/-0) Percona-Server/include/mysql/plugin_ftparser.h.pp (+13/-0) Percona-Server/include/mysql_com.h (+15/-0) Percona-Server/include/violite.h (+1/-1) Percona-Server/internal/mysql-test/suite/i_innodb/r/dummy.result (+1/-0) Percona-Server/internal/mysql-test/suite/i_innodb/t/dummy.test (+3/-0) Percona-Server/internal/mysql-test/suite/i_main/r/dummy.result (+1/-0) Percona-Server/internal/mysql-test/suite/i_main/r/update.result (+17/-0) Percona-Server/internal/mysql-test/suite/i_main/t/dummy.test (+2/-0) Percona-Server/internal/mysql-test/suite/i_main/t/update.test (+21/-0) Percona-Server/man/mysqld.8 (+69/-0) Percona-Server/mysql-test/include/have_64_keys.inc (+12/-0) Percona-Server/mysql-test/include/log_cleanup.inc (+1/-0) Percona-Server/mysql-test/include/log_grep.inc (+41/-0) Percona-Server/mysql-test/include/log_start.inc (+11/-0) Percona-Server/mysql-test/include/log_stop.inc (+7/-0) Percona-Server/mysql-test/include/percona_processlist_row_stats_show.inc (+7/-0) Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc (+95/-0) Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc (+12/-0) Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc (+5/-0) Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc (+3/-0) Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc (+7/-0) Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc (+8/-0) Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc (+56/-0) Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc (+26/-0) Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc (+37/-0) Percona-Server/mysql-test/r/connect.result (+2/-0) Percona-Server/mysql-test/r/create.result (+6/-5) Percona-Server/mysql-test/r/ctype_utf8mb4_heap.result (+4/-0) Percona-Server/mysql-test/r/derived.result (+1/-1) Percona-Server/mysql-test/r/disabled_replication.result (+2/-1) Percona-Server/mysql-test/r/group_commit_crash.result (+101/-0) Percona-Server/mysql-test/r/have_64_keys.require (+14/-0) Percona-Server/mysql-test/r/information_schema.result (+30/-2) Percona-Server/mysql-test/r/information_schema_db.result (+7/-0) Percona-Server/mysql-test/r/mysqld--help-notwin.result (+84/-4) Percona-Server/mysql-test/r/mysqld--help-win.result (+28/-2) Percona-Server/mysql-test/r/mysqlshow.result (+14/-2) Percona-Server/mysql-test/r/percona_bug1008278.result (+11/-0) Percona-Server/mysql-test/r/percona_bug1008609.result (+1/-0) Percona-Server/mysql-test/r/percona_bug1017192.result (+10/-0) Percona-Server/mysql-test/r/percona_bug1035225.result (+32/-0) Percona-Server/mysql-test/r/percona_bug45702.result (+21/-0) Percona-Server/mysql-test/r/percona_bug643149.result (+21/-0) Percona-Server/mysql-test/r/percona_bug856404.result (+8/-0) Percona-Server/mysql-test/r/percona_enforce_storage_engine.result (+36/-0) Percona-Server/mysql-test/r/percona_enhanced_options_modifiers.result (+142/-0) Percona-Server/mysql-test/r/percona_expand_fast_index_creation.result (+64/-0) Percona-Server/mysql-test/r/percona_heap_blob.result (+918/-0) Percona-Server/mysql-test/r/percona_heap_bug783366.result (+14/-0) Percona-Server/mysql-test/r/percona_heap_bug783451.result (+124/-0) Percona-Server/mysql-test/r/percona_heap_bug784464.result (+58/-0) Percona-Server/mysql-test/r/percona_heap_bug784464_32bit.result (+12/-0) Percona-Server/mysql-test/r/percona_heap_bug784464_64bit.result (+12/-0) Percona-Server/mysql-test/r/percona_heap_bug784468.result (+15/-0) Percona-Server/mysql-test/r/percona_heap_bug788544.result (+9/-0) Percona-Server/mysql-test/r/percona_heap_bug788576.result (+19/-0) Percona-Server/mysql-test/r/percona_heap_bug788722.result (+18/-0) Percona-Server/mysql-test/r/percona_heap_bug789131.result (+7/-0) Percona-Server/mysql-test/r/percona_heap_var.result (+194/-0) Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result (+28/-0) Percona-Server/mysql-test/r/percona_innodb_fake_changes.result (+119/-0) Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result (+43/-0) Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result (+151/-0) Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result (+83/-0) Percona-Server/mysql-test/r/percona_innodb_version.result (+3/-0) Percona-Server/mysql-test/r/percona_log_connection_error.result (+16/-0) Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result (+7/-0) Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result (+20/-0) Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_innodb.result (+42/-0) Percona-Server/mysql-test/r/percona_log_slow_query_plan.result (+268/-0) Percona-Server/mysql-test/r/percona_log_slow_query_plan_qc.result (+46/-0) Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result (+31/-0) Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result (+33/-0) Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result (+27/-0) Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_log_slow_verbosity.result (+118/-0) Percona-Server/mysql-test/r/percona_log_warnings_suppress.result (+31/-0) Percona-Server/mysql-test/r/percona_long_query_time.result (+35/-0) Percona-Server/mysql-test/r/percona_min_examined_row_limit.result (+35/-0) Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result (+0/-443) Percona-Server/mysql-test/r/percona_processlist_row_stats.result (+70/-0) Percona-Server/mysql-test/r/percona_query_cache_with_comments.result (+866/-0) Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result (+21/-0) Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result (+865/-0) Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result (+396/-0) Percona-Server/mysql-test/r/percona_secure_file_priv_noarg.result (+13/-0) Percona-Server/mysql-test/r/percona_show_slave_status_nolock.result (+72/-0) Percona-Server/mysql-test/r/percona_signal_handling.result (+3/-0) Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result (+27/-0) Percona-Server/mysql-test/r/percona_slow_extended_log_error.result (+17/-0) Percona-Server/mysql-test/r/percona_slow_query_log_rate.result (+54/-0) Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result (+16/-0) Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result (+24/-0) Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control-cl.result (+6/-0) Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result (+20/-0) Percona-Server/mysql-test/r/percona_ssl_connections_count.result (+21/-0) Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result (+20/-0) Percona-Server/mysql-test/r/percona_utility_user.result (+91/-0) Percona-Server/mysql-test/r/percona_xtradb_bug317074.result (+5/-0) Percona-Server/mysql-test/r/rpl_mysqldump_slave.result (+1/-1) Percona-Server/mysql-test/r/show_check.result (+6/-6) Percona-Server/mysql-test/r/sp-threads.result (+5/-5) Percona-Server/mysql-test/r/userstat_bug602047.result (+19/-0) Percona-Server/mysql-test/r/xa_binlog.result (+32/-0) Percona-Server/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result (+2/-2) Percona-Server/mysql-test/suite/binlog/r/percona_binlog_max_nr.result (+30/-0) Percona-Server/mysql-test/suite/binlog/t/percona_binlog_max_nr-master.opt (+2/-0) Percona-Server/mysql-test/suite/binlog/t/percona_binlog_max_nr.test (+65/-0) Percona-Server/mysql-test/suite/funcs_1/datadict/processlist_priv.inc (+1/-1) Percona-Server/mysql-test/suite/funcs_1/r/is_columns_is.result (+154/-0) Percona-Server/mysql-test/suite/funcs_1/r/is_engines_innodb.result (+1/-1) Percona-Server/mysql-test/suite/funcs_1/r/is_tables_is.result (+230/-0) Percona-Server/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result (+150/-146) Percona-Server/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result (+47/-45) Percona-Server/mysql-test/suite/innodb/include/percona_innodb_kill_idle_trx_show.inc (+2/-0) Percona-Server/mysql-test/suite/innodb/r/bug54330.result (+13/-0) Percona-Server/mysql-test/suite/innodb/r/innodb_wl6347_comp_indx_stat.result (+3/-3) Percona-Server/mysql-test/suite/innodb/r/percona_bug_1133926.result (+0/-4) Percona-Server/mysql-test/suite/innodb/r/percona_bug_951588.result (+12/-0) Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result (+0/-17) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result (+67/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_1105726.result (+3/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_crash.result (+36/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result (+25/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_flush.result (+21/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_log_block_size.result (+7/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result (+76/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_no_innodb.result (+4/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result (+153/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages_empty.result (+2/-0) Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx.result (+39/-0) Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx_locks.result (+45/-0) Percona-Server/mysql-test/suite/innodb/r/percona_log_block_size.result (+11/-0) Percona-Server/mysql-test/suite/innodb/r/percona_skip_innodb_i_s.result (+38/-0) Percona-Server/mysql-test/suite/innodb/t/bug54330.test (+38/-0) Percona-Server/mysql-test/suite/innodb/t/percona_bug_1133926.test (+0/-19) Percona-Server/mysql-test/suite/innodb/t/percona_bug_951588.test (+29/-0) Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147-master.opt (+0/-1) Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test (+0/-29) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test (+253/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726.test (+5/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash.test (+87/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test (+58/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_flush.test (+96/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_log_block_size.test (+37/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test (+200/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb.test (+10/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test (+262/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages_empty.test (+8/-0) Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx.test (+27/-0) Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx_locks.test (+31/-0) Percona-Server/mysql-test/suite/innodb/t/percona_log_block_size-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_log_block_size.test (+40/-0) Percona-Server/mysql-test/suite/innodb/t/percona_skip_innodb_i_s-master.opt (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_skip_innodb_i_s.test (+6/-0) Percona-Server/mysql-test/suite/rpl/r/percona_bug860910.result (+23/-0) Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result (+331/-0) Percona-Server/mysql-test/suite/rpl/r/rpl_percona_crash_resistant_rpl.result (+55/-0) Percona-Server/mysql-test/suite/rpl/r/rpl_trigger_bug67504.result (+31/-0) Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.cnf (+8/-0) Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.test (+38/-0) Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test (+256/-0) Percona-Server/mysql-test/suite/rpl/t/rpl_percona_crash_resistant_rpl-slave.opt (+1/-0) Percona-Server/mysql-test/suite/rpl/t/rpl_percona_crash_resistant_rpl.test (+108/-0) Percona-Server/mysql-test/suite/rpl/t/rpl_trigger_bug67504-slave.opt (+1/-0) Percona-Server/mysql-test/suite/rpl/t/rpl_trigger_bug67504.test (+49/-0) Percona-Server/mysql-test/suite/sys_vars/r/all_vars.result (+8/-2) Percona-Server/mysql-test/suite/sys_vars/r/enforce_storage_engine_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/expand_fast_index_creation_basic.result (+0/-6) Percona-Server/mysql-test/suite/sys_vars/r/innodb_buffer_pool_populate_basic.result (+12/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result (+0/-29) Percona-Server/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result (+0/-1) Percona-Server/mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result (+52/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result (+84/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result (+0/-8) Percona-Server/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result (+21/-0) Percona-Server/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_admin_statements_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_rate_type_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/max_binlog_files_basic.result (+134/-0) Percona-Server/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/query_exec_id_basic.result (+2/-0) Percona-Server/mysql-test/suite/sys_vars/r/query_exec_time_basic.result (+2/-0) Percona-Server/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/r/thread_statistics_basic.result (+6/-0) Percona-Server/mysql-test/suite/sys_vars/r/userstat_basic.result (+3/-0) Percona-Server/mysql-test/suite/sys_vars/t/all_vars.test (+2/-2) Percona-Server/mysql-test/suite/sys_vars/t/enforce_storage_engine_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/expand_fast_index_creation_basic.test (+0/-2) Percona-Server/mysql-test/suite/sys_vars/t/innodb_buffer_pool_populate_basic-master.opt (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_buffer_pool_populate_basic.test (+16/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test (+0/-23) Percona-Server/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test (+1/-1) Percona-Server/mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test (+44/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test (+62/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test (+0/-16) Percona-Server/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test (+21/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_admin_statements_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_rate_type_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/log_warnings_suppress_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/max_binlog_files_basic.test (+147/-0) Percona-Server/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/query_exec_id_basic.test (+4/-0) Percona-Server/mysql-test/suite/sys_vars/t/query_exec_time_basic.test (+4/-0) Percona-Server/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_always_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_precision_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/slow_query_log_use_global_control_basic.test (+1/-0) Percona-Server/mysql-test/suite/sys_vars/t/thread_statistics_basic.test (+4/-0) Percona-Server/mysql-test/suite/sys_vars/t/userstat_basic.test (+1/-0) Percona-Server/mysql-test/t/connect.test (+3/-0) Percona-Server/mysql-test/t/create.test (+6/-1) Percona-Server/mysql-test/t/file_contents.test (+5/-2) Percona-Server/mysql-test/t/group_commit_crash-master.opt (+1/-0) Percona-Server/mysql-test/t/group_commit_crash.test (+82/-0) Percona-Server/mysql-test/t/information_schema.test (+8/-0) Percona-Server/mysql-test/t/percona_bug1008278-slave.opt (+1/-0) Percona-Server/mysql-test/t/percona_bug1008278.test (+23/-0) Percona-Server/mysql-test/t/percona_bug1008609.test (+23/-0) Percona-Server/mysql-test/t/percona_bug1017192.test (+40/-0) Percona-Server/mysql-test/t/percona_bug1035225.test (+47/-0) Percona-Server/mysql-test/t/percona_bug45702.test (+34/-0) Percona-Server/mysql-test/t/percona_bug643149.test (+50/-0) Percona-Server/mysql-test/t/percona_bug856404-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_bug856404.test (+15/-0) Percona-Server/mysql-test/t/percona_enforce_storage_engine-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_enforce_storage_engine.test (+27/-0) Percona-Server/mysql-test/t/percona_enhanced_options_modifiers.test (+167/-0) Percona-Server/mysql-test/t/percona_expand_fast_index_creation.test (+46/-0) Percona-Server/mysql-test/t/percona_heap_blob.test (+631/-0) Percona-Server/mysql-test/t/percona_heap_bug783366.test (+19/-0) Percona-Server/mysql-test/t/percona_heap_bug783451.test (+16/-0) Percona-Server/mysql-test/t/percona_heap_bug784464.test (+66/-0) Percona-Server/mysql-test/t/percona_heap_bug784464_32bit.test (+15/-0) Percona-Server/mysql-test/t/percona_heap_bug784464_64bit.test (+15/-0) Percona-Server/mysql-test/t/percona_heap_bug784468.test (+19/-0) Percona-Server/mysql-test/t/percona_heap_bug788544.test (+15/-0) Percona-Server/mysql-test/t/percona_heap_bug788576.test (+19/-0) Percona-Server/mysql-test/t/percona_heap_bug788722.test (+20/-0) Percona-Server/mysql-test/t/percona_heap_bug789131.test (+14/-0) Percona-Server/mysql-test/t/percona_heap_var.test (+85/-0) Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test (+61/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes.test (+145/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test (+59/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test (+103/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test (+121/-0) Percona-Server/mysql-test/t/percona_innodb_version.test (+8/-0) Percona-Server/mysql-test/t/percona_log_connection_error-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_connection_error.test (+54/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.cnf (+4/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.test (+2/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf (+4/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.test (+2/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf (+4/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.test (+3/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf (+4/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.test (+2/-0) Percona-Server/mysql-test/t/percona_log_slow_admin_statements.test (+41/-0) Percona-Server/mysql-test/t/percona_log_slow_filter-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_slow_filter-cl.test (+2/-0) Percona-Server/mysql-test/t/percona_log_slow_innodb.test (+82/-0) Percona-Server/mysql-test/t/percona_log_slow_query_plan.test (+302/-0) Percona-Server/mysql-test/t/percona_log_slow_query_plan_qc-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_slow_query_plan_qc.test (+71/-0) Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl.test (+3/-0) Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb.test (+48/-0) Percona-Server/mysql-test/t/percona_log_slow_slave_statements.test (+68/-0) Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl.test (+2/-0) Percona-Server/mysql-test/t/percona_log_slow_sp_statements.test (+39/-0) Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test (+2/-0) Percona-Server/mysql-test/t/percona_log_slow_verbosity.test (+75/-0) Percona-Server/mysql-test/t/percona_log_warnings_suppress-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_log_warnings_suppress.test (+47/-0) Percona-Server/mysql-test/t/percona_long_query_time.test (+29/-0) Percona-Server/mysql-test/t/percona_min_examined_row_limit.test (+36/-0) Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test (+0/-227) Percona-Server/mysql-test/t/percona_processlist_row_stats.test (+79/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments.test (+5/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments_crash.test (+22/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable.test (+3/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test (+208/-0) Percona-Server/mysql-test/t/percona_secure_file_priv_noarg-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_secure_file_priv_noarg.test (+27/-0) Percona-Server/mysql-test/t/percona_show_slave_status_nolock.test (+90/-0) Percona-Server/mysql-test/t/percona_signal_handling.test (+11/-0) Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test (+71/-0) Percona-Server/mysql-test/t/percona_slow_extended_log_error.test (+31/-0) Percona-Server/mysql-test/t/percona_slow_query_log_rate.test (+23/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_always-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_always-cl.test (+2/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_always.test (+21/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_precision-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_precision-cl.test (+2/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_precision-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_precision.test (+37/-0) Percona-Server/mysql-test/t/percona_slow_query_log_use_global_control-cl-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_slow_query_log_use_global_control-cl.test (+2/-0) Percona-Server/mysql-test/t/percona_slow_query_log_use_global_control.test (+31/-0) Percona-Server/mysql-test/t/percona_ssl_connections_count.test (+79/-0) Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test (+35/-0) Percona-Server/mysql-test/t/percona_utility_user-master.opt (+1/-0) Percona-Server/mysql-test/t/percona_utility_user.test (+143/-0) Percona-Server/mysql-test/t/percona_xtradb_bug317074.test (+47/-0) Percona-Server/mysql-test/t/ps_1general.test (+5/-0) Percona-Server/mysql-test/t/ps_2myisam.test (+5/-0) Percona-Server/mysql-test/t/ps_3innodb.test (+5/-0) Percona-Server/mysql-test/t/ps_4heap.test (+5/-0) Percona-Server/mysql-test/t/ps_5merge.test (+5/-0) Percona-Server/mysql-test/t/show_check.test (+2/-2) Percona-Server/mysql-test/t/sp-threads.test (+1/-1) Percona-Server/mysql-test/t/userstat_bug602047.test (+16/-0) Percona-Server/mysql-test/t/xa_binlog.test (+32/-0) Percona-Server/mysql-test/valgrind.supp (+9/-0) Percona-Server/mysys/array.c (+35/-10) Percona-Server/mysys/mf_cache.c (+18/-0) Percona-Server/mysys/my_bitmap.c (+1/-1) Percona-Server/mysys/my_pread.c (+24/-1) Percona-Server/mysys/waiting_threads.c (+1/-1) Percona-Server/mysys_ssl/my_getopt.cc (+308/-36) Percona-Server/patch_info/microsec_process.info (+0/-8) Percona-Server/plugin/percona-pam-for-mysql/.bzrignore (+21/-0) Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+34/-0) Percona-Server/plugin/percona-pam-for-mysql/LICENSE (+339/-0) Percona-Server/plugin/percona-pam-for-mysql/Makefile.am (+19/-0) Percona-Server/plugin/percona-pam-for-mysql/README (+40/-0) Percona-Server/plugin/percona-pam-for-mysql/bootstrap (+18/-0) Percona-Server/plugin/percona-pam-for-mysql/build/build-binary.sh.in (+122/-0) Percona-Server/plugin/percona-pam-for-mysql/build/percona-pam-plugin.spec.in (+66/-0) Percona-Server/plugin/percona-pam-for-mysql/configure.ac (+95/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/Makefile (+130/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/make.bat (+170/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/conf.py (+245/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/faq.rst (+51/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/glossary.rst (+8/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/index.rst (+51/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/installation.rst (+50/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/intro.rst (+23/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/manual.rst (+38/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/layout.html (+499/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/searchbox.html (+22/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/static/default.css_t (+469/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/static/jquery.min.js (+154/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/static/percona.com.css (+271/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/static/percona.com.js (+269/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/static/sidebar.js (+151/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/percona-theme/theme.conf (+32/-0) Percona-Server/plugin/percona-pam-for-mysql/doc/source/release-notes.rst (+8/-0) Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am (+37/-0) Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c (+249/-0) Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h (+74/-0) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c (+175/-0) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c (+190/-0) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.h (+71/-0) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c (+131/-0) Percona-Server/plugin/percona-pam-for-mysql/src/dialog.c (+351/-0) Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.c (+80/-0) Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.h (+80/-0) Percona-Server/plugin/percona-pam-for-mysql/src/test_auth_pam_client.c (+82/-0) Percona-Server/scripts/mysql_install_db.sh (+3/-0) Percona-Server/scripts/mysqld_multi.sh (+12/-12) Percona-Server/scripts/mysqld_safe.sh (+68/-0) Percona-Server/scripts/mysqldumpslow.sh (+2/-2) Percona-Server/sql/binlog.cc (+108/-15) Percona-Server/sql/binlog.h (+2/-1) Percona-Server/sql/filesort.cc (+8/-3) Percona-Server/sql/ha_ndbcluster_binlog.cc (+17/-31) Percona-Server/sql/handler.cc (+195/-0) Percona-Server/sql/handler.h (+33/-3) Percona-Server/sql/item.cc (+16/-0) Percona-Server/sql/item.h (+4/-0) Percona-Server/sql/item_func.cc (+2/-2) Percona-Server/sql/item_func.h (+1/-1) Percona-Server/sql/lex.h (+7/-0) Percona-Server/sql/log.cc (+148/-24) Percona-Server/sql/log.h (+5/-4) Percona-Server/sql/log_event.cc (+308/-227) Percona-Server/sql/log_event.h (+33/-26) Percona-Server/sql/log_event_old.cc (+1/-1) Percona-Server/sql/log_event_old.h (+1/-1) Percona-Server/sql/mysqld.cc (+159/-8) Percona-Server/sql/mysqld.h (+42/-3) Percona-Server/sql/opt_range.cc (+1/-1) Percona-Server/sql/query_strip_comments.h (+37/-0) Percona-Server/sql/rpl_slave.cc (+12/-4) Percona-Server/sql/rpl_utility.cc (+1/-0) Percona-Server/sql/set_var.cc (+10/-1) Percona-Server/sql/set_var.h (+9/-1) Percona-Server/sql/signal_handler.cc (+6/-4) Percona-Server/sql/sp_head.cc (+1/-1) Percona-Server/sql/sp_instr.cc (+17/-0) Percona-Server/sql/sql_acl.cc (+263/-5) Percona-Server/sql/sql_acl.h (+4/-0) Percona-Server/sql/sql_base.cc (+50/-15) Percona-Server/sql/sql_bitmap.h (+7/-3) Percona-Server/sql/sql_cache.cc (+311/-15) Percona-Server/sql/sql_class.cc (+281/-4) Percona-Server/sql/sql_class.h (+211/-2) Percona-Server/sql/sql_cmd.h (+7/-0) Percona-Server/sql/sql_connect.cc (+642/-1) Percona-Server/sql/sql_db.cc (+21/-42) Percona-Server/sql/sql_delete.cc (+4/-0) Percona-Server/sql/sql_insert.cc (+63/-6) Percona-Server/sql/sql_lex.cc (+6/-0) Percona-Server/sql/sql_load.cc (+29/-31) Percona-Server/sql/sql_parse.cc (+287/-10) Percona-Server/sql/sql_plugin.cc (+44/-1) Percona-Server/sql/sql_prepare.cc (+309/-6) Percona-Server/sql/sql_profile.cc (+140/-3) Percona-Server/sql/sql_profile.h (+16/-10) Percona-Server/sql/sql_reload.cc (+54/-3) Percona-Server/sql/sql_select.cc (+12/-2) Percona-Server/sql/sql_show.cc (+452/-53) Percona-Server/sql/sql_show.h (+1/-1) Percona-Server/sql/sql_string.cc (+61/-10) Percona-Server/sql/sql_string.h (+10/-0) Percona-Server/sql/sql_table.cc (+24/-4) Percona-Server/sql/sql_tmp_table.cc (+11/-6) Percona-Server/sql/sql_truncate.cc (+15/-14) Percona-Server/sql/sql_update.cc (+8/-4) Percona-Server/sql/sql_yacc.yy (+77/-3) Percona-Server/sql/structs.h (+170/-0) Percona-Server/sql/sys_vars.cc (+204/-3) Percona-Server/sql/sys_vars.h (+49/-3) Percona-Server/sql/table.h (+5/-0) Percona-Server/storage/federated/ha_federated.cc (+6/-0) Percona-Server/storage/heap/CMakeLists.txt (+1/-0) Percona-Server/storage/heap/_check.c (+38/-14) Percona-Server/storage/heap/_rectest.c (+3/-1) Percona-Server/storage/heap/ha_heap.cc (+158/-11) Percona-Server/storage/heap/ha_heap.h (+5/-5) Percona-Server/storage/heap/heapdef.h (+33/-2) Percona-Server/storage/heap/hp_clear.c (+3/-8) Percona-Server/storage/heap/hp_close.c (+4/-0) Percona-Server/storage/heap/hp_create.c (+201/-43) Percona-Server/storage/heap/hp_delete.c (+5/-5) Percona-Server/storage/heap/hp_dspace.c (+440/-0) Percona-Server/storage/heap/hp_extra.c (+0/-1) Percona-Server/storage/heap/hp_hash.c (+107/-28) Percona-Server/storage/heap/hp_info.c (+17/-4) Percona-Server/storage/heap/hp_open.c (+3/-3) Percona-Server/storage/heap/hp_record.c (+498/-0) Percona-Server/storage/heap/hp_rfirst.c (+4/-1) Percona-Server/storage/heap/hp_rkey.c (+4/-1) Percona-Server/storage/heap/hp_rlast.c (+4/-1) Percona-Server/storage/heap/hp_rnext.c (+4/-1) Percona-Server/storage/heap/hp_rprev.c (+4/-1) Percona-Server/storage/heap/hp_rrnd.c (+17/-8) Percona-Server/storage/heap/hp_rsame.c (+9/-2) Percona-Server/storage/heap/hp_scan.c (+16/-23) Percona-Server/storage/heap/hp_test1.c (+16/-1) Percona-Server/storage/heap/hp_test2.c (+25/-2) Percona-Server/storage/heap/hp_update.c (+40/-11) Percona-Server/storage/heap/hp_write.c (+19/-45) Percona-Server/storage/innobase/CMakeLists.txt (+1/-0) Percona-Server/storage/innobase/btr/btr0btr.cc (+26/-2) Percona-Server/storage/innobase/btr/btr0cur.cc (+125/-18) Percona-Server/storage/innobase/btr/btr0pcur.cc (+1/-0) Percona-Server/storage/innobase/buf/buf0buf.cc (+172/-14) Percona-Server/storage/innobase/buf/buf0flu.cc (+4/-4) Percona-Server/storage/innobase/buf/buf0rea.cc (+24/-20) Percona-Server/storage/innobase/dict/dict0dict.cc (+38/-0) Percona-Server/storage/innobase/dict/dict0mem.cc (+3/-0) Percona-Server/storage/innobase/fil/fil0fil.cc (+88/-9) Percona-Server/storage/innobase/fsp/fsp0fsp.cc (+16/-2) Percona-Server/storage/innobase/handler/ha_innodb.cc (+591/-31) Percona-Server/storage/innobase/handler/ha_innodb.h (+3/-0) Percona-Server/storage/innobase/handler/handler0alter.cc (+10/-0) Percona-Server/storage/innobase/handler/i_s.cc (+372/-0) Percona-Server/storage/innobase/handler/i_s.h (+1/-0) Percona-Server/storage/innobase/ibuf/ibuf0ibuf.cc (+42/-1) Percona-Server/storage/innobase/include/btr0btr.h (+4/-1) Percona-Server/storage/innobase/include/btr0cur.h (+3/-2) Percona-Server/storage/innobase/include/buf0buf.h (+4/-0) Percona-Server/storage/innobase/include/buf0rea.h (+6/-3) Percona-Server/storage/innobase/include/dict0dict.h (+8/-0) Percona-Server/storage/innobase/include/dict0mem.h (+10/-0) Percona-Server/storage/innobase/include/fil0fil.h (+22/-4) Percona-Server/storage/innobase/include/ha_prototypes.h (+7/-0) Percona-Server/storage/innobase/include/ibuf0ibuf.h (+16/-0) Percona-Server/storage/innobase/include/lock0lock.h (+3/-0) Percona-Server/storage/innobase/include/log0log.h (+8/-0) Percona-Server/storage/innobase/include/log0online.h (+190/-0) Percona-Server/storage/innobase/include/log0recv.h (+37/-0) Percona-Server/storage/innobase/include/mach0data.ic (+13/-13) Percona-Server/storage/innobase/include/os0file.h (+47/-14) Percona-Server/storage/innobase/include/os0file.ic (+5/-2) Percona-Server/storage/innobase/include/os0proc.h (+2/-1) Percona-Server/storage/innobase/include/read0read.h (+2/-1) Percona-Server/storage/innobase/include/srv0srv.h (+90/-1) Percona-Server/storage/innobase/include/sync0rw.h (+15/-14) Percona-Server/storage/innobase/include/sync0rw.ic (+6/-6) Percona-Server/storage/innobase/include/sync0sync.h (+29/-14) Percona-Server/storage/innobase/include/sync0sync.ic (+6/-6) Percona-Server/storage/innobase/include/trx0trx.h (+14/-0) Percona-Server/storage/innobase/include/univ.i (+6/-1) Percona-Server/storage/innobase/include/ut0rbt.h (+22/-0) Percona-Server/storage/innobase/lock/lock0lock.cc (+73/-11) Percona-Server/storage/innobase/log/log0log.cc (+141/-13) Percona-Server/storage/innobase/log/log0online.cc (+1695/-0) Percona-Server/storage/innobase/log/log0recv.cc (+27/-6) Percona-Server/storage/innobase/os/os0file.cc (+135/-19) Percona-Server/storage/innobase/os/os0proc.cc (+55/-3) Percona-Server/storage/innobase/que/que0que.cc (+16/-0) Percona-Server/storage/innobase/read/read0read.cc (+9/-8) Percona-Server/storage/innobase/row/row0ins.cc (+31/-4) Percona-Server/storage/innobase/row/row0log.cc (+1/-1) Percona-Server/storage/innobase/row/row0merge.cc (+7/-2) Percona-Server/storage/innobase/row/row0mysql.cc (+26/-10) Percona-Server/storage/innobase/row/row0sel.cc (+11/-2) Percona-Server/storage/innobase/row/row0upd.cc (+16/-5) Percona-Server/storage/innobase/srv/srv0conc.cc (+20/-0) Percona-Server/storage/innobase/srv/srv0srv.cc (+347/-14) Percona-Server/storage/innobase/srv/srv0start.cc (+32/-2) Percona-Server/storage/innobase/sync/sync0arr.cc (+5/-7) Percona-Server/storage/innobase/sync/sync0rw.cc (+42/-10) Percona-Server/storage/innobase/sync/sync0sync.cc (+29/-10) Percona-Server/storage/innobase/trx/trx0trx.cc (+64/-4) Percona-Server/storage/innobase/ut/ut0rbt.cc (+26/-1) Percona-Server/storage/myisam/ha_myisam.cc (+81/-4) Percona-Server/storage/myisam/mi_check.c (+1/-1) Percona-Server/storage/myisam/myisamdef.h (+4/-4) Percona-Server/storage/myisam/sort.c (+76/-75) Percona-Server/strings/ctype-simple.c (+3/-12) Percona-Server/support-files/mysql.server.sh (+15/-15) build/build-binary.sh (+2/-1) build/build-shared-compat-rpm.sh (+157/-0) build/debian/libmysqlclient-dev.install (+1/-0) build/debian/percona-server-server-5.6.install (+1/-0) build/debian/rules (+35/-16) build/percona-server.spec (+7/-0) build/percona-shared-compat.spec (+93/-0) doc/Makefile (+0/-145) doc/make.bat (+0/-170) doc/source/conf.py (+0/-270) doc/source/diagnostics/index_info_schema_tables.rst (+0/-15) doc/source/diagnostics/innodb_deadlock_count.rst (+57/-0) doc/source/diagnostics/innodb_show_lock_names.rst (+24/-0) doc/source/diagnostics/innodb_show_status.rst (+475/-0) doc/source/diagnostics/mysql_syslog.rst (+43/-0) doc/source/diagnostics/show_engines.rst (+40/-0) doc/source/diagnostics/slow_extended_55.rst (+377/-0) doc/source/diagnostics/thread_based_profiling.rst (+17/-0) doc/source/diagnostics/user_stats.rst (+242/-0) doc/source/flexibility/buff_read_ahead_area.rst (+36/-0) doc/source/flexibility/improved_memory_engine.rst (+190/-0) doc/source/flexibility/innodb_files_extend.rst (+25/-0) doc/source/flexibility/log_warnings_suppress.rst (+53/-0) doc/source/flexibility/max_binlog_files.rst (+47/-0) doc/source/flexibility/mysqldump_ignore_create_error.rst (+0/-22) doc/source/index.rst (+20/-0) doc/source/index_info_schema_tables.rst (+58/-0) doc/source/installation.rst (+4/-0) doc/source/installation/apt_repo.rst (+0/-65) doc/source/installation/yum_repo.rst (+0/-81) doc/source/management/changed_page_tracking.rst (+85/-0) doc/source/management/enforce_engine.rst (+36/-0) doc/source/management/expanded_program_option_modifiers.rst (+137/-0) doc/source/management/innodb_fake_changes.rst (+70/-0) doc/source/management/innodb_fast_index_creation.rst (+63/-0) doc/source/management/innodb_kill_idle_trx.rst (+25/-0) doc/source/management/pam_plugin.rst (+72/-0) doc/source/management/secure_file_priv_extended.rst (+27/-0) doc/source/management/udf_maatkit.rst (+49/-0) doc/source/management/utility_user.rst (+86/-0) doc/source/percona-theme/layout.html (+0/-368) doc/source/percona-theme/searchbox.html (+0/-22) doc/source/percona-theme/static/default.css_t (+0/-433) doc/source/percona-theme/static/jquery.min.js (+0/-154) doc/source/percona-theme/static/percona.com.css (+0/-1850) doc/source/percona-theme/static/percona.com.js (+0/-269) doc/source/percona-theme/static/sidebar.js (+0/-151) doc/source/percona-theme/theme.conf (+0/-32) doc/source/performance/innodb_numa_support.rst (+66/-0) doc/source/performance/query_cache_enhance.rst (+123/-0) doc/source/release-notes/Percona-Server-5.6.5-60.0.rst (+0/-26) doc/source/release-notes/Percona-Server-5.6.6-60.1.rst (+0/-18) doc/source/release-notes/release-notes_index.rst (+0/-11) doc/source/reliability/error_pad.rst (+55/-0) doc/source/reliability/log_connection_error.rst (+14/-0) doc/source/reliability/show_slave_status_nolock.rst (+23/-0) doc/source/upstream-bug-fixes.rst (+0/-19) lrusort.py (+0/-38) subunit2junitxml (+0/-65) uninstall_tests.sh (+0/-24) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/5.6-merge-1 |
Related bugs: |
|
Related blueprints: |
Merge Percona Server 5.5 to MySQL 5.6
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | 2013-05-20 | Approve on 2013-05-21 | |
Percona core | 2013-05-20 | Pending | |
Review via email:
|
This proposal supersedes a proposal from 2013-05-11.
Description of the change
The contents of the 2nd MP are identical to the 1st one. Resubmitting because the follow-up branch that fixes the "Needs Fixing" items has been submitted at https:/
Merge Percona Server 5.5 as of revision 460 to Percona Server 5.6. This adds all the features mentioned at https:/
The commits. The number of commits was determined by wanting to null-merge some specific revisions (i.e. thread pool in 5.5) and the fact that bzr uncommit / bzr shelve/ bzr unshelve stopped working with some of the bigger revisions.
5.5 merge:
318: merge lp:percona-server/5.5 rev 397.
319: fixes to 318.
320: merge lp:percona-server/5.5 rev 444.
321: subunit2junitxml fix.
322: null-merge lp:percona-server/5.5 rev 446 (already present in 5.6: threadpool and clang fixes).
323: merge lp:percona-server/5.5 rev 460.
5.6 trunk reconciliation:
324: null-merge lp:percona-server/5.6 rev 318 (the revision that null-merged 5.5 to 5.6 originally).
325: merge lp:percona-server/5.6 rev 343.
Jenkins at http://
For this MP review, please set to Needs Fixing only if you see absolutely critical issues. For other issues, please review as usual and I will convert to bug reports and address them post-merge.
Alexey Kopytov (akopytov) wrote : | # |
Hi Laurynas. Time is a precious resource these days, I only did a
superficial review, but here goes. I've broken comments/questions into
multiple sections for convenience.
Needs fixing:
=============
These do not necessarily block the MP and can be fixed
either in this MP or subsequent ones, as you like. I would just like to
have these fixed before the code lands in trunk:
- many spurious copyright changes in the upstream code. Most of them
look like merge oversights in upstream, but I don't think we should
fix their copyrights for them :) Something like this should give
you the list:
: bzr diff -c318 | egrep '^-.*Oracle'
- as changes in disabled_
upstream behavior when SHOW SLAVE STATUS is run on a non-slave
server. Upstream sends an empty row with no warnings, PS 5.6 sends
no column metadata and a warning. Which looks like a very minor
difference, but 1) some monitoring scripts may stop working if
their authors are cautious about warnings and 2) there's really no
reason to change that in PS 5.6, it looks more like an incorrect
merge of show_slave_
- debug fprintf()s in sys_vars.h:
@@ -192,6 +193,9 @@
if (SIGNED)
{
longlong max_val= *max_var_ptr();
+ fprintf(stderr, "v = %lld, max_val = %lld\n", v, max_val);
+ fprintf(stderr, "save_result = %lld\n",
+ (longlong)
(and a couple of more occurrences later)
- rows_read have been removed from PROCESSLIST, but not from the slow
query log. Which means
https:/
is only partially implemented
- incorrect PERCONA_
--- Percona-
+++ Percona-
@@ -46,6 +46,11 @@
#define INNODB_
#define INNODB_
+#ifndef PERCONA_
+#define PERCONA_
+#endif
+
And it is the same in 5.6-merge-3.
- all UNIV_SRV_
we are reintroducing it for no apparent reasons
Needs information:
==================
- can you explain the following change?
--- Percona-
+++ Percona-
@@ -1530,7 +1530,7 @@
heap to myisam.
show status like 'Handler_write';
Variable_name Value
-Handler_write 1021
+Handler_write 1011
set @@max_heap_
drop table t1;
#
- can you explain changes in
mysql-
- what's the story with the top-level 'internal' directory? it is
currently missing in both 5.5 upstream and 5.6 upstream, and the
only useful test it contains is the one for
http://
Was it removed in previous upstream releases, but we decided to
keep it? Do we actually run it in MTR/Jenkins?
Nice to ha...
...2013/5/19 Alexey Kopytov <email address hidden>:
> Review: Needs Information
>
> Hi Laurynas. Time is a precious resource these days, I only did a
> superficial review, but here goes.
Thank you for your time.
> Needs fixing:
> =============
>
> These do not necessarily block the MP and can be fixed
> either in this MP or subsequent ones, as you like. I would just like to
> have these fixed before the code lands in trunk:
I am pushing lp:~laurynas-biveinis/percona-server/5.6-merge-1-fixes
with these items. From commit messages:
> - many spurious copyright changes in the upstream code. Most of them
> look like merge oversights in upstream, but I don't think we should
> fix their copyrights for them :) Something like this should give
> you the list:
>
> : bzr diff -c318 | egrep '^-.*Oracle'
Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.
- Revert the spurious copyright comment changes, so that they match
the ones at the current lp:mysql-server/5.6. Do not touch the ones
that are fixed in the subsequent 5.6.11 merge.
> - as changes in disabled_
> upstream behavior when SHOW SLAVE STATUS is run on a non-slave
> server. Upstream sends an empty row with no warnings, PS 5.6 sends
> no column metadata and a warning. Which looks like a very minor
> difference, but 1) some monitoring scripts may stop working if
> their authors are cautious about warnings and 2) there's really no
> reason to change that in PS 5.6, it looks more like an incorrect
> merge of show_slave_
This one I did on purpose in fact. WARN_NO_MASTER_INFO seemed like the
most logical thing to return when slave is not running. Reverted.
Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.
- Revert the change introduced at the porting where SHOW SLAVE STATUS
would check whether the slave is running, and returning
WARN_
disabled_
> - debug fprintf()s in sys_vars.h:
> - incorrect PERCONA_
> - all UNIV_SRV_
> we are reintroducing it for no apparent reasons
Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.
- Remove introduced-
- Fix Percona InnoDB version in univ.i.
- Remove obsolete UNIV_SRV_
> - can you explain the following change?
>
> --- Percona-
> +++ Percona-
> @@ -1530,7 +1530,7 @@
> heap to myisam.
> show status like 'Handler_write';
> Variable_name Value
> -Handler_write 1021
> +Handler_write 1011
I didn't track it down completely, but I did track it to the MEMORY
VARCHAR support. I guess the query optimizer sees the VARCHAR support
in a temp table even without full BLOB temp table support in the
optimizer. The relevant test snippet is
--echo #
--echo # Bug#12799731 - CRASH IN END_...
Somehow I missed this comment
- rows_read have been removed from PROCESSLIST, but not from the slow
query log. Which means
https:/
is only partially implemented
Yet the blueprint is still there, so there was no risk to miss it for the release. OK to implement on trunk?
Alexey Kopytov (akopytov) wrote : | # |
Hi Laurynas,
On Mon, 20 May 2013 14:01:44 -0000, Laurynas Biveinis wrote:
> To summarize:
> - the "Needs Fixing" issues are being addressed in a follow-up branch.
> Then the merge order becomes: merge-1, merge-1-fixes, 5.6.11, merge-3.
> As soon as merge-1-fixes is approved, I will push the branches to
> trunk in this order as they are being approved;
> - the "Needs Information" issues need your OK or additional converting
> to bug reports;
> - the rest have been converted to bug db.
>
Thanks!
Alexey Kopytov (akopytov) wrote : | # |
Hi Laurynas,
On Tue, 21 May 2013 08:22:28 -0000, Laurynas Biveinis wrote:
> Somehow I missed this comment
>
> - rows_read have been removed from PROCESSLIST, but not from the slow
> query log. Which means
> https:/
> is only partially implemented
>
> Yet the blueprint is still there, so there was no risk to miss it for the release. OK to implement on trunk?
>
Yes.
Two issues I have noticed myself after submitting the MP:
1) A small part of the XtraDB status vars have been either ported, either null-merged incorrectly. Vars that only exist as struct export_var_t declarations: adaptive_ hash_cells; adaptive_ hash_heap_ buffers;
ulint innodb_
ulint innodb_
Vars that exists as struct export_var_t and are exported but apparently are not set:
ulint innodb_dict_tables.
2) Null-merging the 5.5 threadpool- introducing revision was not entirely correct. A better course of action would have been reverting the contents of the merge and resolving the 5.6 threadpool file-ids instead. Now these differ, and will have to be resolved in a separate commit later.
I don't see neither issue as critical and warranting resubmission.