Merge lp:~percona-core/percona-xtradb-cluster/release-5.5.30 into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

Proposed by Ignacio Nin on 2013-04-18
Status: Merged
Approved by: Raghavendra D Prabhu on 2013-05-07
Approved revision: 406
Merged at revision: 387
Proposed branch: lp:~percona-core/percona-xtradb-cluster/release-5.5.30
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Diff against target: 52455 lines (+21054/-18542)
438 files modified
Makefile (+2/-2)
Makefile.ps (+2/-2)
Percona-Server/.bzrignore (+2/-0)
Percona-Server/CMakeLists.txt (+2/-0)
Percona-Server/README (+1/-1)
Percona-Server/VERSION (+1/-1)
Percona-Server/client/mysql.cc (+14/-21)
Percona-Server/client/mysqlbinlog.cc (+4/-0)
Percona-Server/client/mysqldump.c (+163/-60)
Percona-Server/client/mysqltest.cc (+1/-1)
Percona-Server/cmake/wsrep.cmake (+1/-1)
Percona-Server/configure.cmake (+4/-3)
Percona-Server/extra/yassl/src/handshake.cpp (+7/-1)
Percona-Server/include/m_string.h (+40/-0)
Percona-Server/include/my_sys.h (+5/-0)
Percona-Server/include/mysql/service_my_snprintf.h (+1/-0)
Percona-Server/include/mysql/thread_pool_priv.h (+1/-0)
Percona-Server/include/mysql_com.h (+4/-0)
Percona-Server/include/violite.h (+14/-0)
Percona-Server/include/welcome_copyright_notice.h (+2/-2)
Percona-Server/mysql-test/CMakeLists.txt (+4/-2)
Percona-Server/mysql-test/collections/default.daily (+1/-1)
Percona-Server/mysql-test/collections/default.experimental (+0/-5)
Percona-Server/mysql-test/collections/default.push (+6/-5)
Percona-Server/mysql-test/collections/default.release.in (+4/-4)
Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc (+0/-11)
Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc (+0/-22)
Percona-Server/mysql-test/include/have_pool_of_threads.inc (+4/-0)
Percona-Server/mysql-test/include/log_cleanup.inc (+1/-0)
Percona-Server/mysql-test/include/log_start.inc (+0/-16)
Percona-Server/mysql-test/include/log_stop.inc (+0/-7)
Percona-Server/mysql-test/include/mysqld--help.inc (+1/-1)
Percona-Server/mysql-test/include/not_threadpool.inc (+1/-1)
Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc (+0/-50)
Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc (+26/-0)
Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc (+5/-10)
Percona-Server/mysql-test/include/query_response_time-replication.inc (+2/-1)
Percona-Server/mysql-test/lib/My/ConfigFactory.pm (+14/-2)
Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt (+1/-1)
Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc (+12/-8)
Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl (+0/-166)
Percona-Server/mysql-test/lib/mtr_cases.pm (+5/-12)
Percona-Server/mysql-test/lib/mtr_report.pm (+11/-1)
Percona-Server/mysql-test/mysql-test-run.pl (+89/-64)
Percona-Server/mysql-test/r/aborted_clients.result (+10/-0)
Percona-Server/mysql-test/r/create_delayed.result (+3/-0)
Percona-Server/mysql-test/r/ddl_i18n_koi8r.result (+8/-8)
Percona-Server/mysql-test/r/ddl_i18n_utf8.result (+8/-8)
Percona-Server/mysql-test/r/group_min_max_innodb.result (+1/-1)
Percona-Server/mysql-test/r/have_pool_of_threads.require (+2/-0)
Percona-Server/mysql-test/r/mysqlbinlog.result (+32/-0)
Percona-Server/mysql-test/r/mysqld--help-notwin.result (+10/-3)
Percona-Server/mysql-test/r/mysqld--help-win.result (+8/-1)
Percona-Server/mysql-test/r/mysqldump.result (+86/-13)
Percona-Server/mysql-test/r/percona_bug1127008.result (+28/-0)
Percona-Server/mysql-test/r/percona_bug643149.result (+0/-21)
Percona-Server/mysql-test/r/percona_innodb_version.result (+1/-1)
Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result (+0/-35)
Percona-Server/mysql-test/r/percona_log_slow_filter.result (+0/-16)
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-innodb.result (+0/-19)
Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result (+0/-45)
Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result (+0/-25)
Percona-Server/mysql-test/r/percona_log_slow_verbosity.result (+0/-16)
Percona-Server/mysql-test/r/percona_long_query_time.result (+0/-33)
Percona-Server/mysql-test/r/percona_min_examined_row_limit.result (+1/-1)
Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result (+83/-0)
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+13/-1)
Percona-Server/mysql-test/r/percona_server_variables_release.result (+11/-1)
Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result (+23/-168)
Percona-Server/mysql-test/r/percona_slow_extended_log_error.result (+0/-10)
Percona-Server/mysql-test/r/percona_slow_query_log_rate.result (+45/-69)
Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result (+0/-41)
Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result (+0/-18)
Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result (+0/-18)
Percona-Server/mysql-test/r/pool_of_threads.result (+2169/-0)
Percona-Server/mysql-test/r/pool_of_threads_high_prio_tickets.result (+2169/-0)
Percona-Server/mysql-test/r/select.result (+2/-2)
Percona-Server/mysql-test/r/user_var-binlog.result (+2/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_base64_flag.result (+2/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result (+54/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result (+2/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result (+8/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result (+8/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result (+2/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result (+2/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result (+2/-0)
Percona-Server/mysql-test/suite/binlog/r/percona_bug1162085.result (+6/-0)
Percona-Server/mysql-test/suite/binlog/t/percona_bug1162085.test (+30/-0)
Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_until.result (+59/-211)
Percona-Server/mysql-test/suite/engines/funcs/t/disabled.def (+0/-2)
Percona-Server/mysql-test/suite/engines/funcs/t/rpl_row_until.test (+114/-78)
Percona-Server/mysql-test/suite/innodb/r/innodb-index.result (+1/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb_bug14147491.result (+17/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb_bug14676111.result (+53/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb_mysql.result (+4/-4)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result (+14/-12)
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 (+35/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result (+24/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_flush.result (+19/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_log_block_size.result (+6/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result (+0/-7)
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 (+3/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result (+4/-3)
Percona-Server/mysql-test/suite/innodb/r/percona_log_block_size.result (+10/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug14147491-master.opt (+1/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug14147491.test (+75/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug14676111.test (+128/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt (+1/-1)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test (+57/-63)
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 (+85/-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 (+57/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_flush.test (+93/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_log_block_size.test (+36/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt (+0/-1)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test (+0/-29)
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 (+7/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test (+12/-10)
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/parts/r/partition_alter4_innodb.result (+24/-24)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_waits_history.result (+63/-0)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result (+63/-0)
Percona-Server/mysql-test/suite/perfschema/r/start_server_nothing.result (+122/-0)
Percona-Server/mysql-test/suite/perfschema/t/pool_of_threads-master.opt (+1/-1)
Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt (+2/-0)
Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history.test (+14/-0)
Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt (+2/-0)
Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test (+14/-0)
Percona-Server/mysql-test/suite/perfschema/t/start_server_nothing-master.opt (+19/-0)
Percona-Server/mysql-test/suite/perfschema/t/start_server_nothing.test (+30/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_bug31076.result (+2/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_bug68490.result (+8/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result (+4/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_percona_crash_resistant_rpl.result (+18/-9)
Percona-Server/mysql-test/suite/rpl/r/rpl_report_port.result (+2/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result (+11/-23)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result (+10/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_sp.result (+2/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_trigger_bug67504.result (+28/-0)
Percona-Server/mysql-test/suite/rpl/t/disabled.def (+0/-1)
Percona-Server/mysql-test/suite/rpl/t/rpl_bug31076.test (+2/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_bug68490-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_bug68490-slave.opt (+2/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_bug68490.test (+21/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_percona_crash_resistant_rpl.test (+33/-22)
Percona-Server/mysql-test/suite/rpl/t/rpl_report_port.test (+6/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test (+52/-7)
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 (+6/-6)
Percona-Server/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result (+43/-0)
Percona-Server/mysql-test/suite/sys_vars/r/extra_port_basic.result (+21/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.result (+58/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result (+22/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_trx_purge_view_update_only_debug_basic.result (+61/-0)
Percona-Server/mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result (+0/-14)
Percona-Server/mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result (+0/-14)
Percona-Server/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result (+119/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_high_prio_tickets_basic.result (+47/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_idle_timeout_basic.result (+47/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result (+47/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_min_threads_basic.result (+49/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_oversubscribe_basic.result (+47/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_size_basic.result (+41/-0)
Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result (+47/-0)
Percona-Server/mysql-test/suite/sys_vars/t/extra_max_connections_basic.test (+42/-0)
Percona-Server/mysql-test/suite/sys_vars/t/extra_port_basic.test (+21/-0)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_limit_optimistic_insert_debug_basic.test (+50/-0)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test (+48/-0)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_trx_purge_view_update_only_debug_basic.test (+53/-0)
Percona-Server/mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test (+0/-216)
Percona-Server/mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test (+0/-216)
Percona-Server/mysql-test/suite/sys_vars/t/pseudo_slave_mode_basic.test (+168/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_cache_size_func.test (+1/-2)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_high_prio_tickets_basic.test (+43/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test (+43/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test (+42/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test (+43/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test (+43/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_size_basic.test (+47/-0)
Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test (+43/-0)
Percona-Server/mysql-test/t/aborted_clients.test (+28/-0)
Percona-Server/mysql-test/t/create_delayed.test (+34/-0)
Percona-Server/mysql-test/t/disabled.def (+1/-0)
Percona-Server/mysql-test/t/mysqldump.test (+9/-3)
Percona-Server/mysql-test/t/percona_bug1127008.test (+28/-0)
Percona-Server/mysql-test/t/percona_innodb_version.test (+1/-1)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements.test (+0/-20)
Percona-Server/mysql-test/t/percona_log_slow_filter.test (+0/-26)
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.test (+71/-0)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb-slave.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb.test (+0/-42)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-slave.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements.test (+0/-117)
Percona-Server/mysql-test/t/percona_log_slow_sp_statements.test (+0/-29)
Percona-Server/mysql-test/t/percona_log_slow_verbosity.test (+0/-19)
Percona-Server/mysql-test/t/percona_long_query_time.test (+0/-25)
Percona-Server/mysql-test/t/percona_min_examined_row_limit.test (+0/-35)
Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test (+48/-0)
Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test (+0/-87)
Percona-Server/mysql-test/t/percona_slow_extended_log_error.test (+0/-15)
Percona-Server/mysql-test/t/percona_slow_query_log_rate.test (+10/-3)
Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_always.test (+0/-34)
Percona-Server/mysql-test/t/percona_slow_query_log_timestamp_precision.test (+0/-25)
Percona-Server/mysql-test/t/percona_slow_query_log_use_global_control.test (+0/-28)
Percona-Server/mysql-test/t/pool_of_threads.cnf (+15/-0)
Percona-Server/mysql-test/t/pool_of_threads.test (+80/-0)
Percona-Server/mysql-test/t/pool_of_threads_high_prio_tickets.cnf (+16/-0)
Percona-Server/mysql-test/t/pool_of_threads_high_prio_tickets.test (+19/-0)
Percona-Server/mysys/errors.c (+18/-6)
Percona-Server/mysys/mf_cache.c (+5/-3)
Percona-Server/mysys/mf_pack.c (+5/-4)
Percona-Server/mysys/my_access.c (+64/-0)
Percona-Server/mysys/my_error.c (+22/-0)
Percona-Server/mysys/my_lib.c (+6/-4)
Percona-Server/mysys/my_write.c (+4/-0)
Percona-Server/mysys/thr_lock.c (+5/-1)
Percona-Server/mysys/thr_rwlock.c (+1/-1)
Percona-Server/packaging/WiX/custom_ui.wxs (+2/-2)
Percona-Server/packaging/rpm-uln/mysql.spec.sh (+26/-11)
Percona-Server/patch_info/optimizer_fix.info (+0/-8)
Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+5/-0)
Percona-Server/scripts/clustercheck.sh (+28/-16)
Percona-Server/scripts/fill_help_tables.sql (+2094/-9)
Percona-Server/scripts/mysqlchk.sh (+1/-1)
Percona-Server/scripts/mysqld_safe.sh (+36/-20)
Percona-Server/scripts/wsrep_sst_rsync.sh (+6/-5)
Percona-Server/scripts/wsrep_sst_xtrabackup.sh (+3/-11)
Percona-Server/sql-common/client.c (+3/-3)
Percona-Server/sql/CMakeLists.txt (+8/-1)
Percona-Server/sql/event_scheduler.cc (+0/-1)
Percona-Server/sql/field.cc (+4/-4)
Percona-Server/sql/filesort.cc (+4/-3)
Percona-Server/sql/ha_partition.cc (+20/-2)
Percona-Server/sql/handler.cc (+44/-18)
Percona-Server/sql/handler.h (+5/-0)
Percona-Server/sql/item_cmpfunc.cc (+11/-11)
Percona-Server/sql/item_func.cc (+21/-8)
Percona-Server/sql/item_func.h (+16/-2)
Percona-Server/sql/item_subselect.cc (+2/-1)
Percona-Server/sql/item_sum.cc (+9/-6)
Percona-Server/sql/item_xmlfunc.cc (+5/-1)
Percona-Server/sql/lex.h (+1/-0)
Percona-Server/sql/log.cc (+49/-23)
Percona-Server/sql/log_event.cc (+17/-6)
Percona-Server/sql/log_event.h (+16/-2)
Percona-Server/sql/mdl.cc (+5/-1)
Percona-Server/sql/mdl.h (+8/-2)
Percona-Server/sql/mysqld.cc (+314/-297)
Percona-Server/sql/mysqld.h (+5/-0)
Percona-Server/sql/net_serv.cc (+6/-2)
Percona-Server/sql/opt_range.cc (+5/-23)
Percona-Server/sql/protocol.cc (+1/-1)
Percona-Server/sql/rpl_utility.cc (+7/-2)
Percona-Server/sql/scheduler.cc (+41/-48)
Percona-Server/sql/scheduler.h (+18/-4)
Percona-Server/sql/signal_handler.cc (+5/-4)
Percona-Server/sql/slave.cc (+8/-9)
Percona-Server/sql/sql_admin.cc (+24/-4)
Percona-Server/sql/sql_base.cc (+133/-40)
Percona-Server/sql/sql_base.h (+28/-2)
Percona-Server/sql/sql_cache.cc (+15/-15)
Percona-Server/sql/sql_class.cc (+87/-88)
Percona-Server/sql/sql_class.h (+20/-22)
Percona-Server/sql/sql_client.cc (+1/-0)
Percona-Server/sql/sql_connect.cc (+19/-25)
Percona-Server/sql/sql_db.cc (+1/-1)
Percona-Server/sql/sql_insert.cc (+18/-1)
Percona-Server/sql/sql_parse.cc (+169/-90)
Percona-Server/sql/sql_prepare.cc (+45/-11)
Percona-Server/sql/sql_reload.cc (+16/-0)
Percona-Server/sql/sql_repl.cc (+4/-0)
Percona-Server/sql/sql_select.cc (+55/-31)
Percona-Server/sql/sql_select.h (+15/-1)
Percona-Server/sql/sql_table.cc (+132/-107)
Percona-Server/sql/sql_yacc.yy (+15/-2)
Percona-Server/sql/strfunc.cc (+1/-1)
Percona-Server/sql/sys_vars.cc (+199/-5)
Percona-Server/sql/threadpool.h (+72/-0)
Percona-Server/sql/threadpool_common.cc (+277/-0)
Percona-Server/sql/threadpool_unix.cc (+1691/-0)
Percona-Server/sql/threadpool_win.cc (+763/-0)
Percona-Server/sql/transaction.cc (+17/-3)
Percona-Server/sql/tztime.cc (+3/-18)
Percona-Server/sql/wsrep_hton.cc (+6/-0)
Percona-Server/sql/wsrep_sst.cc (+1/-1)
Percona-Server/sql/wsrep_utils.cc (+2/-4)
Percona-Server/storage/archive/ha_archive.cc (+7/-6)
Percona-Server/storage/heap/hp_delete.c (+14/-4)
Percona-Server/storage/innobase/btr/btr0btr.c (+50/-26)
Percona-Server/storage/innobase/btr/btr0cur.c (+59/-60)
Percona-Server/storage/innobase/btr/btr0pcur.c (+6/-7)
Percona-Server/storage/innobase/btr/btr0sea.c (+1/-4)
Percona-Server/storage/innobase/buf/buf0buf.c (+129/-183)
Percona-Server/storage/innobase/buf/buf0flu.c (+32/-17)
Percona-Server/storage/innobase/buf/buf0lru.c (+143/-80)
Percona-Server/storage/innobase/buf/buf0rea.c (+9/-9)
Percona-Server/storage/innobase/dict/dict0dict.c (+3/-3)
Percona-Server/storage/innobase/dict/dict0load.c (+2/-1)
Percona-Server/storage/innobase/fil/fil0fil.c (+90/-84)
Percona-Server/storage/innobase/fsp/fsp0fsp.c (+15/-30)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+256/-151)
Percona-Server/storage/innobase/handler/handler0alter.cc (+0/-2)
Percona-Server/storage/innobase/handler/i_s.cc (+4/-3)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c (+1/-1)
Percona-Server/storage/innobase/include/btr0btr.ic (+1/-1)
Percona-Server/storage/innobase/include/btr0cur.h (+5/-0)
Percona-Server/storage/innobase/include/btr0cur.ic (+13/-0)
Percona-Server/storage/innobase/include/buf0buf.h (+46/-8)
Percona-Server/storage/innobase/include/buf0buf.ic (+35/-16)
Percona-Server/storage/innobase/include/buf0flu.ic (+1/-1)
Percona-Server/storage/innobase/include/buf0lru.h (+4/-8)
Percona-Server/storage/innobase/include/data0type.ic (+7/-25)
Percona-Server/storage/innobase/include/fil0fil.h (+15/-0)
Percona-Server/storage/innobase/include/fut0fut.ic (+1/-4)
Percona-Server/storage/innobase/include/lock0lock.h (+11/-3)
Percona-Server/storage/innobase/include/log0log.h (+12/-4)
Percona-Server/storage/innobase/include/log0log.ic (+19/-4)
Percona-Server/storage/innobase/include/log0online.h (+37/-9)
Percona-Server/storage/innobase/include/mtr0mtr.h (+2/-0)
Percona-Server/storage/innobase/include/mtr0mtr.ic (+21/-0)
Percona-Server/storage/innobase/include/os0file.h (+2/-0)
Percona-Server/storage/innobase/include/read0read.h (+24/-9)
Percona-Server/storage/innobase/include/read0read.ic (+18/-25)
Percona-Server/storage/innobase/include/rem0rec.h (+42/-38)
Percona-Server/storage/innobase/include/srv0srv.h (+42/-3)
Percona-Server/storage/innobase/include/sync0sync.h (+2/-0)
Percona-Server/storage/innobase/include/trx0purge.h (+5/-0)
Percona-Server/storage/innobase/include/trx0sys.h (+38/-0)
Percona-Server/storage/innobase/include/trx0sys.ic (+26/-20)
Percona-Server/storage/innobase/include/trx0trx.h (+39/-7)
Percona-Server/storage/innobase/include/trx0trx.ic (+4/-4)
Percona-Server/storage/innobase/include/univ.i (+9/-13)
Percona-Server/storage/innobase/lock/lock0lock.c (+245/-122)
Percona-Server/storage/innobase/log/log0log.c (+13/-6)
Percona-Server/storage/innobase/log/log0online.c (+255/-64)
Percona-Server/storage/innobase/log/log0recv.c (+11/-4)
Percona-Server/storage/innobase/mtr/mtr0mtr.c (+35/-4)
Percona-Server/storage/innobase/os/os0file.c (+5/-5)
Percona-Server/storage/innobase/read/read0read.c (+104/-104)
Percona-Server/storage/innobase/rem/rem0rec.c (+191/-66)
Percona-Server/storage/innobase/row/row0ins.c (+9/-5)
Percona-Server/storage/innobase/row/row0merge.c (+99/-30)
Percona-Server/storage/innobase/row/row0mysql.c (+7/-0)
Percona-Server/storage/innobase/row/row0sel.c (+16/-13)
Percona-Server/storage/innobase/row/row0umod.c (+3/-0)
Percona-Server/storage/innobase/row/row0undo.c (+1/-1)
Percona-Server/storage/innobase/row/row0upd.c (+50/-12)
Percona-Server/storage/innobase/row/row0vers.c (+3/-3)
Percona-Server/storage/innobase/srv/srv0srv.c (+192/-83)
Percona-Server/storage/innobase/srv/srv0start.c (+5/-0)
Percona-Server/storage/innobase/trx/trx0purge.c (+29/-4)
Percona-Server/storage/innobase/trx/trx0rec.c (+20/-0)
Percona-Server/storage/innobase/trx/trx0roll.c (+4/-4)
Percona-Server/storage/innobase/trx/trx0sys.c (+10/-1)
Percona-Server/storage/innobase/trx/trx0trx.c (+204/-48)
Percona-Server/storage/myisam/mi_open.c (+6/-0)
Percona-Server/storage/myisam/mi_search.c (+9/-6)
Percona-Server/storage/perfschema/pfs_events_waits.cc (+6/-0)
Percona-Server/strings/ctype-simple.c (+9/-11)
Percona-Server/strings/decimal.c (+17/-16)
Percona-Server/strings/my_vsnprintf.c (+2/-0)
Percona-Server/support-files/mysql.spec.sh (+0/-1)
Percona-Server/vio/vio.c (+24/-1)
Percona-Server/vio/vio_priv.h (+5/-0)
Percona-Server/vio/viosocket.c (+78/-1)
UDF/configure.ac (+1/-0)
build/build-binary.sh (+56/-5)
build/build-dpkg.sh (+1/-1)
build/build-rpm.sh (+7/-7)
build/build-shared-compat-rpm.sh (+1/-1)
build/debian/additions/innotop/InnoDBParser.pm (+0/-1089)
build/debian/additions/innotop/changelog.innotop (+0/-318)
build/debian/additions/innotop/innotop (+0/-9485)
build/debian/additions/innotop/innotop.1 (+0/-2086)
build/debian/control (+14/-2)
build/debian/percona-xtradb-cluster-client-5.5.dirs (+0/-1)
build/debian/percona-xtradb-cluster-client-5.5.docs (+0/-1)
build/debian/percona-xtradb-cluster-client-5.5.install (+0/-3)
build/debian/percona-xtradb-cluster-client-5.5.lintian-overrides (+0/-2)
build/debian/percona-xtradb-cluster-client-5.5.menu (+0/-2)
build/debian/percona-xtradb-cluster-server-5.5.docs (+2/-2)
build/debian/percona-xtradb-cluster-server-5.5.postinst (+9/-1)
build/debian/rules (+60/-50)
build/percona-shared-compat.spec (+5/-1)
build/percona-xtradb-cluster.spec (+53/-45)
doc-ps/source/conf.py (+1/-1)
doc-ps/source/flexibility/buff_read_ahead_area.rst (+36/-0)
doc-ps/source/flexibility/improved_memory_engine.rst (+190/-0)
doc-ps/source/flexibility/innodb_files_extend.rst (+24/-0)
doc-ps/source/flexibility/mysqldump_ignore_create_error.rst (+22/-0)
doc-ps/source/index.rst (+5/-2)
doc-ps/source/installation.rst (+7/-3)
doc-ps/source/management/changed_page_tracking.rst (+12/-2)
doc-ps/source/management/innodb_buffer_pool_shm.rst (+0/-26)
doc-ps/source/management/innodb_expanded_fast_index_creation.rst (+4/-2)
doc-ps/source/management/innodb_kill_idle_trx.rst (+23/-0)
doc-ps/source/management/innodb_lru_dump_restore.rst (+1/-1)
doc-ps/source/management/pam_plugin.rst (+72/-0)
doc-ps/source/management/sql_no_fcache.rst (+0/-34)
doc-ps/source/management/udf_maatkit.rst (+0/-48)
doc-ps/source/management/udf_percona_toolkit.rst (+54/-0)
doc-ps/source/performance/binary_group_commit.rst (+45/-0)
doc-ps/source/performance/handlersocket.rst (+0/-109)
doc-ps/source/performance/innodb_doublewrite_path.rst (+0/-87)
doc-ps/source/performance/innodb_fast_checksum.rst (+1/-1)
doc-ps/source/performance/innodb_numa_support.rst (+6/-6)
doc-ps/source/performance/innodb_purge_thread.rst (+0/-7)
doc-ps/source/performance/query_cache_enhance.rst (+89/-0)
doc-ps/source/performance/threadpool.rst (+159/-0)
doc-ps/source/release-notes/Percona-Server-5.5.15-21.0.rst (+1/-1)
doc-ps/source/release-notes/Percona-Server-5.5.24-26.0.rst (+1/-1)
doc-ps/source/release-notes/Percona-Server-5.5.28-29.3.rst (+1/-1)
doc-ps/source/release-notes/Percona-Server-5.5.29-29.4.rst (+1/-1)
doc-ps/source/release-notes/Percona-Server-5.5.29-30.0.rst (+65/-0)
doc-ps/source/release-notes/Percona-Server-5.5.30-30.1.rst (+30/-0)
doc-ps/source/release-notes/release-notes_index.rst (+35/-0)
doc-ps/source/reliability/innodb_corrupt_table_action.rst (+52/-0)
doc-ps/source/scalability/innodb_io_55.rst (+286/-0)
doc-ps/source/upstream-bug-fixes.rst (+55/-13)
policy/apparmor/usr.sbin.mysqld (+116/-0)
policy/apparmor/usr.sbin.mysqld.local (+2/-0)
policy/selinux/percona-xtradb-cluster.fc (+7/-0)
policy/selinux/percona-xtradb-cluster.te (+73/-0)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/release-5.5.30
Reviewer Review Type Date Requested Status
Ignacio Nin (community) Approve on 2013-04-24
Vadim Tkachenko 2013-04-24 Pending
Review via email: mp+159735@code.launchpad.net

Description of the change

Changes for release 5.5.30.

To post a comment you must log in.
406. By Ignacio Nin on 2013-04-23

Merge fix for bug #1168032

Ignacio Nin (ignacio-nin) wrote :

The packaging changes are OK. The rest of the changes are a merge from Percona-Server 5.5.30 and codership-mysql that have been tested and released.

review: Approve
Ignacio Nin (ignacio-nin) wrote :

Let's expedite this merge since new changes that depend on this are beginning to pile up.

Fix for Bug #1096123 is missing in the log. Is it merged into this?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-01-25 01:53:12 +0000
3+++ Makefile 2013-04-23 05:48:36 +0000
4@@ -1,7 +1,7 @@
5 FETCH_CMD=wget
6 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
7-MYSQL_VERSION=5.5.29
8-PERCONA_SERVER_VERSION=rel29.1
9+MYSQL_VERSION=5.5.30
10+PERCONA_SERVER_VERSION=rel30.2
11 PERCONA_XTRADB_CLUSTER ?=Percona-XtraDB-Cluster-$(MYSQL_VERSION)
12 PERCONA_SERVER ?=Percona-Server
13 DEBUG_DIR ?= $(PERCONA_XTRADB_CLUSTER)-debug
14
15=== modified file 'Makefile.ps'
16--- Makefile.ps 2013-01-25 01:53:12 +0000
17+++ Makefile.ps 2013-04-23 05:48:36 +0000
18@@ -1,7 +1,7 @@
19 FETCH_CMD=wget
20 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
21-MYSQL_VERSION=5.5.29
22-PERCONA_SERVER_VERSION=rel29.4
23+MYSQL_VERSION=5.5.30
24+PERCONA_SERVER_VERSION=rel30.2
25 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
26 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
27 PERCONA_SERVER_SHORT_2 ?=Percona-Server
28
29=== modified file 'Percona-Server/.bzrignore'
30--- Percona-Server/.bzrignore 2012-10-25 20:21:22 +0000
31+++ Percona-Server/.bzrignore 2013-04-23 05:48:36 +0000
32@@ -1313,6 +1313,7 @@
33 mysql-test/*.vcproj
34 mysql-test/.DS_Store
35 mysql-test/collections/default.release
36+mysql-test/collections/default.release.done
37 mysql-test/funcs_1.log
38 mysql-test/funcs_1.tar
39 mysql-test/gmon.out
40@@ -3072,4 +3073,5 @@
41 Docs/INFO_BIN
42 Docs/INFO_SRC
43 Testing
44+FilesCopied
45 source_downloads
46
47=== modified file 'Percona-Server/CMakeLists.txt'
48--- Percona-Server/CMakeLists.txt 2013-01-16 01:34:54 +0000
49+++ Percona-Server/CMakeLists.txt 2013-04-23 05:48:36 +0000
50@@ -50,6 +50,8 @@
51 MARK_AS_ADVANCED(MANUFACTURER)
52 ENDIF()
53
54+#PAM build Handling
55+OPTION(WITH_PAM "Build with Percona PAM plugin" OFF)
56 # We choose to provide WITH_DEBUG as alias to standard CMAKE_BUILD_TYPE=Debug
57 # which turns out to be not trivial, as this involves synchronization
58 # between CMAKE_BUILD_TYPE and WITH_DEBUG. Besides, we have to deal with cases
59
60=== modified file 'Percona-Server/README'
61--- Percona-Server/README 2012-02-28 11:50:23 +0000
62+++ Percona-Server/README 2013-04-23 05:48:36 +0000
63@@ -5,7 +5,7 @@
64 is released under the version 2 of the GNU General Public License.
65 MySQL is brought to you by Oracle.
66
67-Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
68+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
69
70 License information can be found in the COPYING file.
71
72
73=== modified file 'Percona-Server/VERSION'
74--- Percona-Server/VERSION 2013-01-16 01:34:54 +0000
75+++ Percona-Server/VERSION 2013-04-23 05:48:36 +0000
76@@ -1,4 +1,4 @@
77 MYSQL_VERSION_MAJOR=5
78 MYSQL_VERSION_MINOR=5
79-MYSQL_VERSION_PATCH=29
80+MYSQL_VERSION_PATCH=30
81 MYSQL_VERSION_EXTRA=
82
83=== modified file 'Percona-Server/client/mysql.cc'
84--- Percona-Server/client/mysql.cc 2013-01-21 21:48:22 +0000
85+++ Percona-Server/client/mysql.cc 2013-04-23 05:48:36 +0000
86@@ -193,7 +193,6 @@
87 static uint prompt_counter;
88 static char delimiter[16]= DEFAULT_DELIMITER;
89 static uint delimiter_length= 1;
90-unsigned short terminal_width= 80;
91
92 #ifdef HAVE_SMEM
93 static char *shared_memory_base_name=0;
94@@ -1073,9 +1072,7 @@
95 static void nice_time(double sec,char *buff,bool part_second);
96 extern "C" sig_handler mysql_end(int sig);
97 extern "C" sig_handler handle_sigint(int sig);
98-#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
99-static sig_handler window_resize(int sig);
100-#endif
101+static unsigned short get_terminal_width();
102
103
104 int main(int argc,char *argv[])
105@@ -1175,13 +1172,6 @@
106 signal(SIGINT, handle_sigint); // Catch SIGINT to clean up
107 signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up
108
109-#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
110- /* Readline will call this if it installs a handler */
111- signal(SIGWINCH, window_resize);
112- /* call the SIGWINCH handler to get the default term width */
113- window_resize(0);
114-#endif
115-
116 put_info("Welcome to the MySQL monitor. Commands end with ; or \\g.",
117 INFO_INFO);
118 sprintf((char*) glob_buffer.ptr(),
119@@ -1354,15 +1344,16 @@
120 }
121
122
123+unsigned short get_terminal_width()
124+{
125 #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
126-sig_handler window_resize(int sig)
127-{
128 struct winsize window_size;
129
130 if (ioctl(fileno(stdin), TIOCGWINSZ, &window_size) == 0)
131- terminal_width= window_size.ws_col;
132+ return window_size.ws_col;
133+#endif
134+ return 80;
135 }
136-#endif
137
138 static struct my_option my_long_options[] =
139 {
140@@ -2338,17 +2329,19 @@
141 {
142 uint length=(uint) (out-line);
143
144- if (!truncated &&
145- (length < 9 ||
146- my_strnncoll (charset_info,
147- (uchar *)line, 9, (const uchar *) "delimiter", 9)))
148+ if (!truncated && (length < 9 ||
149+ my_strnncoll (charset_info, (uchar *)line, 9,
150+ (const uchar *) "delimiter", 9) ||
151+ (*in_string || *ml_comment)))
152 {
153 /*
154 Don't add a new line in case there's a DELIMITER command to be
155 added to the glob buffer (e.g. on processing a line like
156 "<command>;DELIMITER <non-eof>") : similar to how a new line is
157 not added in the case when the DELIMITER is the first command
158- entered with an empty glob buffer.
159+ entered with an empty glob buffer. However, if the delimiter is
160+ part of a string or a comment, the new line should be added. (e.g.
161+ SELECT '\ndelimiter\n';\n)
162 */
163 *out++='\n';
164 length++;
165@@ -3132,7 +3125,7 @@
166 print_table_data_html(result);
167 else if (opt_xml)
168 print_table_data_xml(result);
169- else if (vertical || (auto_vertical_output && (terminal_width < get_result_width(result))))
170+ else if (vertical || (auto_vertical_output && (get_terminal_width() < get_result_width(result))))
171 print_table_data_vertically(result);
172 else if (opt_silent && verbose <= 2 && !output_tables)
173 print_tab_data(result);
174
175=== modified file 'Percona-Server/client/mysqlbinlog.cc'
176--- Percona-Server/client/mysqlbinlog.cc 2013-01-21 21:48:22 +0000
177+++ Percona-Server/client/mysqlbinlog.cc 2013-04-23 05:48:36 +0000
178@@ -2120,6 +2120,8 @@
179 else
180 load_processor.init_by_cur_dir();
181
182+ fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;\n");
183+
184 fprintf(result_file,
185 "/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");
186
187@@ -2170,6 +2172,8 @@
188 "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"
189 "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n");
190
191+ fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;\n");
192+
193 if (tmpdir.list)
194 free_tmpdir(&tmpdir);
195 if (result_file != stdout)
196
197=== modified file 'Percona-Server/client/mysqldump.c'
198--- Percona-Server/client/mysqldump.c 2013-01-21 21:48:22 +0000
199+++ Percona-Server/client/mysqldump.c 2013-04-23 05:48:36 +0000
200@@ -2277,7 +2277,6 @@
201 const char *routine_type[]= {"FUNCTION", "PROCEDURE"};
202 char db_name_buff[NAME_LEN*2+3], name_buff[NAME_LEN*2+3];
203 char *routine_name;
204- char *query_str;
205 int i;
206 FILE *sql_file= md_result_file;
207 MYSQL_RES *routine_res, *routine_list_res;
208@@ -2371,17 +2370,6 @@
209 fprintf(sql_file, "/*!50003 DROP %s IF EXISTS %s */;\n",
210 routine_type[i], routine_name);
211
212- query_str= cover_definer_clause(row[2], strlen(row[2]),
213- C_STRING_WITH_LEN("50020"),
214- C_STRING_WITH_LEN("50003"),
215- C_STRING_WITH_LEN(" FUNCTION"));
216-
217- if (!query_str)
218- query_str= cover_definer_clause(row[2], strlen(row[2]),
219- C_STRING_WITH_LEN("50020"),
220- C_STRING_WITH_LEN("50003"),
221- C_STRING_WITH_LEN(" PROCEDURE"));
222-
223 if (mysql_num_fields(routine_res) >= 6)
224 {
225 if (switch_db_collation(sql_file, db_name_buff, ";",
226@@ -2419,9 +2407,9 @@
227
228 fprintf(sql_file,
229 "DELIMITER ;;\n"
230- "/*!50003 %s */;;\n"
231+ "%s ;;\n"
232 "DELIMITER ;\n",
233- (const char *) (query_str != NULL ? query_str : row[2]));
234+ (const char *) row[2]);
235
236 restore_sql_mode(sql_file, ";");
237
238@@ -2436,7 +2424,6 @@
239 }
240 }
241
242- my_free(query_str);
243 }
244 } /* end of routine printing */
245 mysql_free_result(routine_res);
246@@ -2461,6 +2448,48 @@
247 }
248
249 /*
250+ Find the first occurrence of a quoted identifier in a given string. Returns
251+ the pointer to the opening quote, and stores the pointer to the closing quote
252+ to the memory location pointed to by the 'end' argument,
253+
254+ If no quoted identifiers are found, returns NULL (and the value pointed to by
255+ 'end' is undefined in this case).
256+*/
257+
258+static const char *parse_quoted_identifier(const char *str,
259+ const char **end)
260+{
261+ const char *from;
262+ const char *to;
263+
264+ if (!(from= strchr(str, '`')))
265+ return NULL;
266+
267+ to= from;
268+
269+ while ((to= strchr(to + 1, '`'))) {
270+ /*
271+ Double backticks represent a backtick in identifier, rather than a quote
272+ character.
273+ */
274+ if (to[1] == '`')
275+ {
276+ to++;
277+ continue;
278+ }
279+
280+ break;
281+ }
282+
283+ if (to <= from + 1)
284+ return NULL; /* Empty identifier */
285+
286+ *end= to;
287+
288+ return from;
289+}
290+
291+/*
292 Parse the specified key definition string and check if the key contains an
293 AUTO_INCREMENT column as the first key part. We only check for the first key
294 part, because unlike MyISAM, InnoDB does not allow the AUTO_INCREMENT column
295@@ -2471,32 +2500,22 @@
296 const char *keydef,
297 key_type_t type)
298 {
299- char *from, *to;
300+ const char *from, *to;
301 uint idnum;
302
303 DBUG_ASSERT(type != KEY_TYPE_NONE);
304
305- if (autoinc_column == NULL || !(from= strchr(keydef, '`')))
306+ if (autoinc_column == NULL)
307 return FALSE;
308
309- to= from;
310 idnum= 0;
311
312- while ((to= strchr(to + 1, '`')))
313+ /*
314+ There is only 1 iteration of the following loop for type == KEY_TYPE_PRIMARY
315+ and 2 iterations for type == KEY_TYPE_UNIQUE / KEY_TYPE_NON_UNIQUE.
316+ */
317+ while ((from= parse_quoted_identifier(keydef, &to)))
318 {
319- /*
320- Double backticks represent a backtick in identifier, rather than a quote
321- character.
322- */
323- if (to[1] == '`')
324- {
325- to++;
326- continue;
327- }
328-
329- if (to <= from + 1)
330- break; /* Broken key definition */
331-
332 idnum++;
333
334 /*
335@@ -2511,11 +2530,10 @@
336 Check only the first (for PRIMARY KEY) or the second (for secondary keys)
337 quoted identifier.
338 */
339- if ((idnum == 1 + test(type != KEY_TYPE_PRIMARY)) ||
340- !(from= strchr(to + 1, '`')))
341+ if ((idnum == 1 + test(type != KEY_TYPE_PRIMARY)))
342 break;
343
344- to= from;
345+ keydef= to + 1;
346 }
347
348 return FALSE;
349@@ -2523,6 +2541,42 @@
350
351
352 /*
353+ Find a node in the skipped keys list whose name matches a quoted
354+ identifier specified as 'id_from' and 'id_to' arguments.
355+*/
356+
357+static LIST *find_matching_skipped_key(const char *id_from,
358+ const char *id_to)
359+{
360+ LIST *list;
361+ size_t id_len;
362+
363+ id_len= id_to - id_from + 1;
364+ DBUG_ASSERT(id_len > 2);
365+
366+ for (list= skipped_keys_list; list; list= list_rest(list))
367+ {
368+ const char *keydef;
369+ const char *keyname_from;
370+ const char *keyname_to;
371+ size_t keyname_len;
372+
373+ keydef= list->data;
374+
375+ if ((keyname_from= parse_quoted_identifier(keydef, &keyname_to)))
376+ {
377+ keyname_len= keyname_to - keyname_from + 1;
378+
379+ if (id_len == keyname_len &&
380+ !strncmp(keyname_from, id_from, id_len))
381+ return list;
382+ }
383+ }
384+
385+ return NULL;
386+}
387+
388+/*
389 Remove secondary/foreign key definitions from a given SHOW CREATE TABLE string
390 and store them into a temporary list to be used later.
391
392@@ -2549,6 +2603,9 @@
393 char *autoinc_column= NULL;
394 my_bool has_autoinc= FALSE;
395 key_type_t type;
396+ const char *constr_from;
397+ const char *constr_to;
398+ LIST *keydef_node;
399
400 strend= create_str + strlen(create_str);
401
402@@ -2568,7 +2625,37 @@
403 c= *tmp;
404 *tmp= '\0'; /* so strstr() only processes the current line */
405
406- if (!strncmp(ptr, "UNIQUE KEY ", sizeof("UNIQUE KEY ") - 1))
407+ if (!strncmp(ptr, "CONSTRAINT ", sizeof("CONSTRAINT ") - 1) &&
408+ (constr_from= parse_quoted_identifier(ptr, &constr_to)) &&
409+ (keydef_node= find_matching_skipped_key(constr_from, constr_to)))
410+ {
411+ char *keydef;
412+ size_t keydef_len;
413+
414+ /*
415+ There's a skipped key with the same name as the constraint name. Let's
416+ put it back before the current constraint definition and remove from the
417+ skipped keys list.
418+ */
419+ keydef= keydef_node->data;
420+ keydef_len= strlen(keydef) + 5; /* ", \n " */
421+
422+ memmove(orig_ptr + keydef_len, orig_ptr, strend - orig_ptr + 1);
423+ memcpy(ptr, keydef, keydef_len - 5);
424+ memcpy(ptr + keydef_len - 5, ", \n ", 5);
425+
426+ skipped_keys_list= list_delete(skipped_keys_list, keydef_node);
427+ my_free(keydef);
428+ my_free(keydef_node);
429+
430+ strend+= keydef_len;
431+ orig_ptr+= keydef_len;
432+ ptr+= keydef_len;
433+ tmp+= keydef_len;
434+
435+ type= KEY_TYPE_NONE;
436+ }
437+ else if (!strncmp(ptr, "UNIQUE KEY ", sizeof("UNIQUE KEY ") - 1))
438 type= KEY_TYPE_UNIQUE;
439 else if (!strncmp(ptr, "KEY ", sizeof("KEY ") - 1))
440 type= KEY_TYPE_NON_UNIQUE;
441@@ -3629,6 +3716,38 @@
442
443
444 /*
445+ Dump delayed secondary index definitions when --innodb-optimize-keys is used.
446+*/
447+
448+static void dump_skipped_keys(const char *table)
449+{
450+ uint keys;
451+
452+ if (!skipped_keys_list)
453+ return;
454+
455+ verbose_msg("-- Dumping delayed secondary index definitions for table %s\n",
456+ table);
457+
458+ skipped_keys_list= list_reverse(skipped_keys_list);
459+ fprintf(md_result_file, "ALTER TABLE %s ", table);
460+ for (keys= list_length(skipped_keys_list); keys > 0; keys--)
461+ {
462+ LIST *node= skipped_keys_list;
463+ char *def= node->data;
464+
465+ fprintf(md_result_file, "ADD %s%s", def, (keys > 1) ? ", " : ";\n");
466+
467+ skipped_keys_list= list_delete(skipped_keys_list, node);
468+ my_free(def);
469+ my_free(node);
470+ }
471+
472+ DBUG_ASSERT(skipped_keys_list == NULL);
473+}
474+
475+
476+/*
477
478 SYNOPSIS
479 dump_table()
480@@ -3671,9 +3790,14 @@
481 if (strcmp(table_type, "VIEW") == 0)
482 DBUG_VOID_RETURN;
483
484+ result_table= quote_name(table,table_buff, 1);
485+ opt_quoted_table= quote_name(table, table_buff2, 0);
486+
487 /* Check --no-data flag */
488 if (opt_no_data)
489 {
490+ dump_skipped_keys(opt_quoted_table);
491+
492 verbose_msg("-- Skipping dump data for table '%s', --no-data was used\n",
493 table);
494 DBUG_VOID_RETURN;
495@@ -3708,13 +3832,11 @@
496 if (!opt_events && !my_strcasecmp(&my_charset_latin1, db, "mysql") &&
497 !my_strcasecmp(&my_charset_latin1, table, "event"))
498 {
499- verbose_msg("-- Skipping data table mysql.event, --skip-events was used\n");
500+ fprintf(stderr, "-- Warning: Skipping the data of table mysql.event."
501+ " Specify the --events option explicitly.\n");
502 DBUG_VOID_RETURN;
503 }
504
505- result_table= quote_name(table,table_buff, 1);
506- opt_quoted_table= quote_name(table, table_buff2, 0);
507-
508 verbose_msg("-- Sending SELECT query...\n");
509
510 init_dynamic_string_checked(&query_string, "", 1024, 1024);
511@@ -4113,26 +4235,7 @@
512 goto err;
513 }
514
515- /* Perform delayed secondary index creation for --innodb-optimize-keys */
516- if (skipped_keys_list)
517- {
518- uint keys;
519- skipped_keys_list= list_reverse(skipped_keys_list);
520- fprintf(md_result_file, "ALTER TABLE %s ", opt_quoted_table);
521- for (keys= list_length(skipped_keys_list); keys > 0; keys--)
522- {
523- LIST *node= skipped_keys_list;
524- char *def= node->data;
525-
526- fprintf(md_result_file, "ADD %s%s", def, (keys > 1) ? ", " : ";\n");
527-
528- skipped_keys_list= list_delete(skipped_keys_list, node);
529- my_free(def);
530- my_free(node);
531- }
532-
533- DBUG_ASSERT(skipped_keys_list == NULL);
534- }
535+ dump_skipped_keys(opt_quoted_table);
536
537 /* Moved enable keys to before unlock per bug 15977 */
538 if (opt_disable_keys)
539
540=== modified file 'Percona-Server/client/mysqltest.cc'
541--- Percona-Server/client/mysqltest.cc 2013-01-17 22:50:22 +0000
542+++ Percona-Server/client/mysqltest.cc 2013-04-23 05:48:36 +0000
543@@ -1312,7 +1312,7 @@
544 void free_used_memory()
545 {
546 uint i;
547- DBUG_ENTER("free_used_memory");
548+ // Do not use DBUG_ENTER("free_used_memory"); here, see below.
549
550 if (connections)
551 close_connections();
552
553=== modified file 'Percona-Server/cmake/wsrep.cmake'
554--- Percona-Server/cmake/wsrep.cmake 2013-02-06 17:19:28 +0000
555+++ Percona-Server/cmake/wsrep.cmake 2013-04-23 05:48:36 +0000
556@@ -17,7 +17,7 @@
557 # so WSREP_VERSION is produced regardless
558
559 # Set the patch version
560-SET(WSREP_PATCH_VERSION "7.1")
561+SET(WSREP_PATCH_VERSION "7.4")
562
563 # Obtain patch revision number
564 SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
565
566=== modified file 'Percona-Server/configure.cmake'
567--- Percona-Server/configure.cmake 2012-04-23 14:18:55 +0000
568+++ Percona-Server/configure.cmake 2013-04-23 05:48:36 +0000
569@@ -1018,11 +1018,12 @@
570 MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY)
571
572 IF(WITH_VALGRIND)
573- CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
574- HAVE_VALGRIND_HEADERS)
575+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)
576 IF(HAVE_VALGRIND_HEADERS)
577 SET(HAVE_VALGRIND 1)
578- ENDIF()
579+ ELSE()
580+ MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")
581+ ENDIF(HAVE_VALGRIND_HEADERS)
582 ENDIF()
583
584 #--------------------------------------------------------------------
585
586=== modified file 'Percona-Server/extra/yassl/src/handshake.cpp'
587--- Percona-Server/extra/yassl/src/handshake.cpp 2012-02-13 12:44:54 +0000
588+++ Percona-Server/extra/yassl/src/handshake.cpp 2013-04-23 05:48:36 +0000
589@@ -767,8 +767,14 @@
590
591 while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {
592 // each message in record, can be more than 1 if not encrypted
593- if (ssl.getSecurity().get_parms().pending_ == false) // cipher on
594+ if (ssl.getSecurity().get_parms().pending_ == false) { // cipher on
595+ // sanity check for malicious/corrupted/illegal input
596+ if (buffer.get_remaining() < hdr.length_) {
597+ ssl.SetError(bad_input);
598+ return 0;
599+ }
600 decrypt_message(ssl, buffer, hdr.length_);
601+ }
602
603 mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_));
604 if (!msg.get()) {
605
606=== modified file 'Percona-Server/include/m_string.h'
607--- Percona-Server/include/m_string.h 2012-02-17 09:57:45 +0000
608+++ Percona-Server/include/m_string.h 2013-04-23 05:48:36 +0000
609@@ -263,6 +263,45 @@
610 @return the last non-space character
611 */
612
613+#ifdef __x86_64__
614+
615+#if SIZEOF_LONG != 8
616+# error "SIZEOF_LONG != 8"
617+#endif
618+
619+/* Modern x86_64 CPUs do not have penalties for unaligned access */
620+
621+static inline const uchar *skip_trailing_space(const uchar *ptr, size_t len)
622+{
623+ const uchar *begin;
624+ ulong UNINIT_VAR(val);
625+
626+ if (unlikely(ptr == NULL))
627+ return NULL;
628+
629+ begin= ptr;
630+ ptr= ptr + len - 8;
631+
632+ while (ptr >= begin && (val= (*(ulong *) ptr) ^ 0x2020202020202020) == 0)
633+ ptr-= 8;
634+
635+ if (likely(ptr >= begin))
636+ {
637+ do {
638+ ptr++;
639+ } while (val>>= 8);
640+
641+ return ptr;
642+ }
643+
644+ for (ptr= ptr + 8; ptr > begin && ptr[-1] == 0x20; ptr--)
645+ /* empty */;
646+
647+ return ptr;
648+}
649+
650+#else
651+
652 static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len)
653 {
654 const uchar *end= ptr + len;
655@@ -288,6 +327,7 @@
656 end--;
657 return (end);
658 }
659+#endif
660
661 static inline void lex_string_set(LEX_STRING *lex_str, const char *c_str)
662 {
663
664=== modified file 'Percona-Server/include/my_sys.h'
665--- Percona-Server/include/my_sys.h 2012-10-25 18:10:52 +0000
666+++ Percona-Server/include/my_sys.h 2013-04-23 05:48:36 +0000
667@@ -210,6 +210,7 @@
668 extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags);
669 extern void (*fatal_error_handler_hook)(uint my_err, const char *str,
670 myf MyFlags);
671+extern void(*sql_print_warning_hook)(const char *format,...);
672 extern uint my_file_limit;
673 extern ulong my_thread_stack_size;
674
675@@ -606,6 +607,7 @@
676
677 extern int check_if_legal_filename(const char *path);
678 extern int check_if_legal_tablename(const char *path);
679+extern my_bool is_filename_allowed(const char *name, size_t length);
680
681 #ifdef _WIN32
682 extern int nt_share_delete(const char *name,myf MyFlags);
683@@ -642,6 +644,7 @@
684 va_list ap);
685 extern int my_error_register(const char** (*get_errmsgs) (),
686 int first, int last);
687+extern void my_printf_warning (const char * format, ...);
688 extern const char **my_error_unregister(int first, int last);
689 extern void my_message(uint my_err, const char *str,myf MyFlags);
690 extern void my_message_stderr(uint my_err, const char *str, myf MyFlags);
691@@ -856,6 +859,8 @@
692 extern my_bool my_gethwaddr(uchar *to);
693 extern int my_getncpus();
694
695+#define my_microsecond_getsystime() (my_getsystime()/10)
696+
697 #ifdef HAVE_SYS_MMAN_H
698 #include <sys/mman.h>
699
700
701=== modified file 'Percona-Server/include/mysql/service_my_snprintf.h'
702--- Percona-Server/include/mysql/service_my_snprintf.h 2011-06-30 15:46:53 +0000
703+++ Percona-Server/include/mysql/service_my_snprintf.h 2013-04-23 05:48:36 +0000
704@@ -49,6 +49,7 @@
705 string will be quoted according to MySQL identifier quoting rules.
706
707 Both <width> and <precision> can be specified as numbers or '*'.
708+ If an asterisk is used, an argument of type int is consumed.
709
710 <length modifier> can be 'l', 'll', or 'z'.
711
712
713=== modified file 'Percona-Server/include/mysql/thread_pool_priv.h'
714--- Percona-Server/include/mysql/thread_pool_priv.h 2012-08-28 14:13:03 +0000
715+++ Percona-Server/include/mysql/thread_pool_priv.h 2013-04-23 05:48:36 +0000
716@@ -61,6 +61,7 @@
717 void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var);
718 ulong thd_get_net_wait_timeout(THD *thd);
719 my_socket thd_get_fd(THD *thd);
720+int thd_store_globals(THD* thd);
721
722 THD *first_global_thread();
723 THD *next_global_thread(THD *thd);
724
725=== modified file 'Percona-Server/include/mysql_com.h'
726--- Percona-Server/include/mysql_com.h 2012-05-10 07:49:14 +0000
727+++ Percona-Server/include/mysql_com.h 2013-04-23 05:48:36 +0000
728@@ -152,6 +152,10 @@
729 #define REFRESH_USER_STATS 0x800000L /* Refresh user stats my_hash table */
730 #define REFRESH_CLIENT_STATS 0x1000000L /* Refresh client stats my_hash table */
731 #define REFRESH_THREAD_STATS 0x2000000L /* Refresh thread stats my_hash table */
732+#define REFRESH_FLUSH_PAGE_BITMAPS 0x400000L
733+#define REFRESH_RESET_PAGE_BITMAPS 0x800000L
734+
735+#define PURGE_BITMAPS_TO_LSN 1
736
737 #define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */
738 #define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */
739
740=== modified file 'Percona-Server/include/violite.h'
741--- Percona-Server/include/violite.h 2012-05-07 20:20:42 +0000
742+++ Percona-Server/include/violite.h 2013-04-23 05:48:36 +0000
743@@ -171,12 +171,24 @@
744 #define vio_should_retry(vio) (vio)->should_retry(vio)
745 #define vio_was_interrupted(vio) (vio)->was_interrupted(vio)
746 #define vio_close(vio) ((vio)->vioclose)(vio)
747+#define vio_shutdown(vio,how) ((vio)->shutdown)(vio,how)
748 #define vio_peer_addr(vio, buf, prt, buflen) (vio)->peer_addr(vio, buf, prt, buflen)
749 #define vio_timeout(vio, which, seconds) (vio)->timeout(vio, which, seconds)
750 #define vio_poll_read(vio, timeout) (vio)->poll_read(vio, timeout)
751 #define vio_is_connected(vio) (vio)->is_connected(vio)
752 #endif /* !defined(DONT_MAP_VIO) */
753
754+#ifdef _WIN32
755+/*
756+ Set thread id for io cancellation (required on Windows XP only,
757+ and should to be removed if XP is no more supported)
758+*/
759+
760+#define vio_set_thread_id(vio, tid) if(vio) vio->thread_id= tid
761+#else
762+#define vio_set_thread_id(vio, tid)
763+#endif
764+
765 /* This enumerator is used in parser - should be always visible */
766 enum SSL_type
767 {
768@@ -222,6 +234,7 @@
769 void (*timeout)(Vio*, unsigned int which, unsigned int timeout);
770 my_bool (*poll_read)(Vio *vio, uint timeout);
771 my_bool (*is_connected)(Vio*);
772+ int (*shutdown)(Vio *, int);
773 my_bool (*has_data) (Vio*);
774 #ifdef HAVE_OPENSSL
775 void *ssl_arg;
776@@ -238,6 +251,7 @@
777 char *shared_memory_pos;
778 #endif /* HAVE_SMEM */
779 #ifdef _WIN32
780+ DWORD thread_id; /* Used on XP only by vio_shutdown() */
781 OVERLAPPED pipe_overlapped;
782 DWORD read_timeout_ms;
783 DWORD write_timeout_ms;
784
785=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
786--- Percona-Server/include/welcome_copyright_notice.h 2012-08-07 13:37:13 +0000
787+++ Percona-Server/include/welcome_copyright_notice.h 2013-04-23 05:48:36 +0000
788@@ -1,4 +1,4 @@
789-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
790+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
791
792 This program is free software; you can redistribute it and/or modify
793 it under the terms of the GNU General Public License as published by
794@@ -16,7 +16,7 @@
795 #ifndef _welcome_copyright_notice_h_
796 #define _welcome_copyright_notice_h_
797
798-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012"
799+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
800
801 /*
802 This define specifies copyright notice which is displayed by every MySQL
803
804=== modified file 'Percona-Server/mysql-test/CMakeLists.txt'
805--- Percona-Server/mysql-test/CMakeLists.txt 2012-02-16 09:48:16 +0000
806+++ Percona-Server/mysql-test/CMakeLists.txt 2013-04-23 05:48:36 +0000
807@@ -1,4 +1,4 @@
808-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
809+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
810 #
811 # This program is free software; you can redistribute it and/or modify
812 # it under the terms of the GNU General Public License as published by
813@@ -150,8 +150,10 @@
814 FILE(GLOB infiles "collections/*.in")
815 FOREACH(collin ${infiles})
816 STRING(REPLACE ".in" "" collection ${collin})
817+ STRING(REPLACE ".in" ".done" colldone ${collin})
818 # Only generate file once
819- IF(NOT EXISTS ${collection})
820+ IF(NOT EXISTS ${colldone})
821 PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
822+ FILE(APPEND ${colldone} "${collin}\n")
823 ENDIF()
824 ENDFOREACH()
825
826=== modified file 'Percona-Server/mysql-test/collections/default.daily'
827--- Percona-Server/mysql-test/collections/default.daily 2011-03-11 09:12:58 +0000
828+++ Percona-Server/mysql-test/collections/default.daily 2013-04-23 05:48:36 +0000
829@@ -1,5 +1,5 @@
830
831-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal --vardir=var-normal --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
832+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal --vardir=var-normal --report-features --skip-test-list=collections/disabled-daily.list
833 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
834 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=row --vardir=var-row --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
835 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --mysqld=--binlog-format=row --ps-protocol --skip-test-list=collections/disabled-daily.list
836
837=== modified file 'Percona-Server/mysql-test/collections/default.experimental'
838--- Percona-Server/mysql-test/collections/default.experimental 2012-02-03 14:23:33 +0000
839+++ Percona-Server/mysql-test/collections/default.experimental 2013-04-23 05:48:36 +0000
840@@ -18,9 +18,4 @@
841 sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
842 sys_vars.wait_timeout_func # Bug#11750645 2010-04-26 alik wait_timeout_func fails
843
844-# BUG #59055 : All ndb tests should be removed from the repository
845-# Leaving the sys_vars tests for now. sys_vars.all_vars.test fails on removing ndb tests
846-sys_vars.ndb_log_update_as_write_basic
847-sys_vars.have_ndbcluster_basic
848-sys_vars.ndb_log_updated_only_basic
849 sys_vars.rpl_init_slave_func # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
850
851=== modified file 'Percona-Server/mysql-test/collections/default.push'
852--- Percona-Server/mysql-test/collections/default.push 2011-02-21 12:56:43 +0000
853+++ Percona-Server/mysql-test/collections/default.push 2013-04-23 05:48:36 +0000
854@@ -1,5 +1,6 @@
855-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
856-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
857-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --vardir=var-emebbed --embedded --experimental=collections/default.experimental --skip-ndb
858-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
859-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb
860+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
861+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
862+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --vardir=var-emebbed --embedded --experimental=collections/default.experimental
863+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
864+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental
865+
866
867=== modified file 'Percona-Server/mysql-test/collections/default.release.in'
868--- Percona-Server/mysql-test/collections/default.release.in 2011-09-29 08:42:23 +0000
869+++ Percona-Server/mysql-test/collections/default.release.in 2013-04-23 05:48:36 +0000
870@@ -4,14 +4,14 @@
871 # include default.daily
872 # include default.weekly
873
874-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=debug --vardir=var-debug --skip-ndbcluster --skip-rpl --report-features --debug-server
875-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal --vardir=var-normal --skip-ndbcluster --report-features
876-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps --vardir=var-ps --skip-ndbcluster --ps-protocol
877+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=debug --vardir=var-debug --skip-rpl --report-features --debug-server
878+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal --vardir=var-normal --report-features
879+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps --vardir=var-ps --ps-protocol
880 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs1+ps --vardir=var-funcs_1_ps --suite=funcs_1 --ps-protocol
881 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs2 --vardir=var-funcs2 --suite=funcs_2
882 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts --suite=parts
883 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=stress --vardir=var-stress --suite=stress
884 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=jp --vardir=var-jp --suite=jp
885-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-embedded --embedded-server --skip-rpl --skip-ndbcluster
886+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-embedded --embedded-server --skip-rpl
887 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist --vardir=var-nist --suite=nist
888 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist+ps --vardir=var-nist_ps --suite=nist --ps-protocol
889
890=== removed file 'Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc'
891--- Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc 2012-11-25 09:30:58 +0000
892+++ Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc 1970-01-01 00:00:00 +0000
893@@ -1,11 +0,0 @@
894-# Remove all the InnoDB bitmap files. A temporary measure until RESET user request is implemented
895-
896-let $MYSQLD_DATADIR= `select @@datadir`;
897-
898---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
899---shutdown_server 10
900---source include/wait_until_disconnected.inc
901-remove_files_wildcard $MYSQLD_DATADIR ib_modified_log*;
902---enable_reconnect
903---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
904---source include/wait_until_connected_again.inc
905
906=== removed file 'Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc'
907--- Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc 2007-02-26 08:16:22 +0000
908+++ Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc 1970-01-01 00:00:00 +0000
909@@ -1,22 +0,0 @@
910---exec $MYSQL test -e "show processlist" > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
911---disable_warnings
912-drop table if exists t999;
913---enable_warnings
914-# Create a table to hold the process list
915-create temporary table t999(
916- id int,
917- user char(255),
918- host char(255),
919- db char(255),
920- Command char(255),
921- time int,
922- State char(255),
923- info char(255)
924-);
925-# Load processlist into table, headers will create seom warnings
926---disable_warnings
927---replace_result $MYSQLTEST_VARDIR "."
928-eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
929---enable_warnings
930-let $id = `select Id from t999 where Command="Binlog Dump"`;
931-drop table t999;
932
933=== added file 'Percona-Server/mysql-test/include/have_pool_of_threads.inc'
934--- Percona-Server/mysql-test/include/have_pool_of_threads.inc 1970-01-01 00:00:00 +0000
935+++ Percona-Server/mysql-test/include/have_pool_of_threads.inc 2013-04-23 05:48:36 +0000
936@@ -0,0 +1,4 @@
937+-- require r/have_pool_of_threads.require
938+disable_query_log;
939+show variables like 'thread_handling';
940+enable_query_log;
941
942=== added file 'Percona-Server/mysql-test/include/log_cleanup.inc'
943--- Percona-Server/mysql-test/include/log_cleanup.inc 1970-01-01 00:00:00 +0000
944+++ Percona-Server/mysql-test/include/log_cleanup.inc 2013-04-23 05:48:36 +0000
945@@ -0,0 +1,1 @@
946+--remove_files_wildcard $MYSQLTEST_VARDIR *.slog
947
948=== added file 'Percona-Server/mysql-test/include/log_start.inc'
949--- Percona-Server/mysql-test/include/log_start.inc 1970-01-01 00:00:00 +0000
950+++ Percona-Server/mysql-test/include/log_start.inc 2013-04-23 05:48:36 +0000
951@@ -0,0 +1,11 @@
952+--let slow_query_log_file_old=`SELECT Variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE Variable_name = 'slow_query_log_file';`
953+--let slow_query_log_old=`SELECT Variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE Variable_name = 'slow_query_log';`
954+--let log_output_old=`SELECT Variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE Variable_name = 'log_output';`
955+--disable_query_log
956+--let log_file_full_path = $MYSQLTEST_VARDIR/$log_file.slog
957+SET GLOBAL slow_query_log=0;
958+SET GLOBAL log_output=FILE;
959+--echo [log_start.inc] $log_file
960+EVAL SET GLOBAL slow_query_log_file="$log_file_full_path";
961+SET GLOBAL slow_query_log=1;
962+--enable_query_log
963
964=== removed file 'Percona-Server/mysql-test/include/log_start.inc'
965--- Percona-Server/mysql-test/include/log_start.inc 2012-04-18 23:25:38 +0000
966+++ Percona-Server/mysql-test/include/log_start.inc 1970-01-01 00:00:00 +0000
967@@ -1,16 +0,0 @@
968---disable_query_log
969---let log_file_full_path = $MYSQLTEST_VARDIR/$log_file
970-SET @slow_query_log_old=@@slow_query_log;
971-SET @slow_query_log_file_old= @@slow_query_log_file;
972-SET GLOBAL slow_query_log=OFF;
973-perl;
974- $log_file_full_path= $ENV{'log_file_full_path'};
975- unlink $log_file_full_path;
976- open(FILE, '>', $log_file_full_path)
977- or die "Cannot create log file $log_file_full_path, reason: $!";
978- close(FILE);
979-EOF
980---echo [log_start.inc] $log_file
981-EVAL SET GLOBAL slow_query_log_file="$log_file_full_path";
982-SET GLOBAL slow_query_log=ON;
983---enable_query_log
984
985=== added file 'Percona-Server/mysql-test/include/log_stop.inc'
986--- Percona-Server/mysql-test/include/log_stop.inc 1970-01-01 00:00:00 +0000
987+++ Percona-Server/mysql-test/include/log_stop.inc 2013-04-23 05:48:36 +0000
988@@ -0,0 +1,7 @@
989+--disable_query_log
990+SET GLOBAL slow_query_log=0;
991+--echo [log_stop.inc] $log_file
992+EVAL SET GLOBAL log_output= $log_output_old;
993+EVAL SET GLOBAL slow_query_log_file= "$slow_query_log_file_old";
994+EVAL SET GLOBAL slow_query_log= $slow_query_log_old;
995+--enable_query_log
996
997=== removed file 'Percona-Server/mysql-test/include/log_stop.inc'
998--- Percona-Server/mysql-test/include/log_stop.inc 2012-04-18 23:25:38 +0000
999+++ Percona-Server/mysql-test/include/log_stop.inc 1970-01-01 00:00:00 +0000
1000@@ -1,7 +0,0 @@
1001---disable_query_log
1002-FLUSH LOGS;
1003-SET GLOBAL slow_query_log=OFF;
1004---echo [log_stop.inc] $log_file
1005-SET GLOBAL slow_query_log_file= @slow_query_log_file_old;
1006-SET GLOBAL slow_query_log= @slow_query_log_old;
1007---enable_query_log
1008
1009=== modified file 'Percona-Server/mysql-test/include/mysqld--help.inc'
1010--- Percona-Server/mysql-test/include/mysqld--help.inc 2011-08-16 09:08:10 +0000
1011+++ Percona-Server/mysql-test/include/mysqld--help.inc 2013-04-23 05:48:36 +0000
1012@@ -22,7 +22,7 @@
1013
1014 # Plugins which may or may not be there:
1015 @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
1016- thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
1017+ thread-concurrency super-large-pages mutex-deadlock-detector null-audit thread-pool/;
1018
1019 # And substitute the content some environment variables with their
1020 # names:
1021
1022=== modified file 'Percona-Server/mysql-test/include/not_threadpool.inc'
1023--- Percona-Server/mysql-test/include/not_threadpool.inc 2011-01-14 08:28:23 +0000
1024+++ Percona-Server/mysql-test/include/not_threadpool.inc 2013-04-23 05:48:36 +0000
1025@@ -1,5 +1,5 @@
1026 if (`SELECT count(*) FROM information_schema.GLOBAL_VARIABLES WHERE
1027 VARIABLE_NAME = 'THREAD_HANDLING' AND
1028- VARIABLE_VALUE = 'loaded-dynamically'`){
1029+ VARIABLE_VALUE = 'pool-of-threads'`){
1030 skip Test requires: 'not_threadpool';
1031 }
1032
1033=== removed file 'Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc'
1034--- Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc 2012-10-27 05:16:07 +0000
1035+++ Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc 1970-01-01 00:00:00 +0000
1036@@ -1,50 +0,0 @@
1037---echo ################################################################################
1038---let grep_pattern=CREATE
1039---source include/log_grep.inc
1040---let grep_pattern=INSERT
1041---source include/log_grep.inc
1042---let grep_pattern=SELECT
1043---source include/log_grep.inc
1044---let grep_pattern=Quit
1045---source include/log_grep.inc
1046---let grep_pattern=Last_errno: [^0]+
1047---source include/log_grep.inc
1048---let grep_pattern=Last_errno: 0
1049---source include/log_grep.inc
1050---let grep_pattern=Rows_sent: [^0]+
1051---source include/log_grep.inc
1052---let grep_pattern=Rows_sent: 0
1053---source include/log_grep.inc
1054---let grep_pattern=Rows_examined: [^0]+
1055---source include/log_grep.inc
1056---let grep_pattern=Rows_examined: 0
1057---source include/log_grep.inc
1058---let grep_pattern=Rows_affected: [^0]+
1059---source include/log_grep.inc
1060---let grep_pattern=Rows_affected: 0
1061---source include/log_grep.inc
1062---let grep_pattern=Rows_read: [^0]+
1063---source include/log_grep.inc
1064---let grep_pattern=Rows_read: 0
1065---source include/log_grep.inc
1066---let grep_pattern=Bytes_sent: [^0]+
1067---source include/log_grep.inc
1068---let grep_pattern=Bytes_sent: 0
1069---source include/log_grep.inc
1070---let grep_pattern=Tmp_tables: [^0]+
1071---source include/log_grep.inc
1072---let grep_pattern=Tmp_tables: 0
1073---source include/log_grep.inc
1074---let grep_pattern=Tmp_disk_tables: [^0]+
1075---source include/log_grep.inc
1076---let grep_pattern=Tmp_disk_tables: 0
1077---source include/log_grep.inc
1078---let grep_pattern=Tmp_table_sizes: [^0]+
1079---source include/log_grep.inc
1080---let grep_pattern=Tmp_table_sizes: 0
1081---source include/log_grep.inc
1082---let grep_pattern=# No InnoDB statistics available for this query
1083---source include/log_grep.inc
1084---let grep_pattern=# InnoDB_trx_id:
1085---source include/log_grep.inc
1086---echo ################################################################################
1087
1088=== added file 'Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc'
1089--- Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc 1970-01-01 00:00:00 +0000
1090+++ Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc 2013-04-23 05:48:36 +0000
1091@@ -0,0 +1,26 @@
1092+# Common extensions to the slow query log
1093+--let grep_pattern = ^# Thread_id: \d+ Schema: .+ Last_errno: \d+ Killed: \d+\$
1094+--source include/log_grep.inc
1095+--let grep_pattern = ^#.*Rows_affected: \d+ Rows_read: \d+\$
1096+--source include/log_grep.inc
1097+--let grep_pattern = ^# Bytes_sent: \d+.*\$
1098+--source include/log_grep.inc
1099+# InnoDB
1100+--let grep_pattern = ^# InnoDB_trx_id: \w+\$
1101+--source include/log_grep.inc
1102+# Query plan
1103+--let grep_pattern = ^# Bytes_sent: \d+ Tmp_tables: \d+ Tmp_disk_tables: \d+ Tmp_table_sizes: \d+\$
1104+--source include/log_grep.inc
1105+--let grep_pattern = ^# QC_Hit: (Yes|No) Full_scan: (Yes|No) Full_join: (Yes|No) Tmp_table: (Yes|No) Tmp_table_on_disk: (Yes|No)\$
1106+--source include/log_grep.inc
1107+--let grep_pattern = ^# Filesort: (Yes|No) Filesort_on_disk: (Yes|No) Merge_passes: \d+\$
1108+--source include/log_grep.inc
1109+# InnoDB
1110+--let grep_pattern = ^# InnoDB_IO_r_ops: \d+ InnoDB_IO_r_bytes: \d+ InnoDB_IO_r_wait: \d*\.\d*\$
1111+--source include/log_grep.inc
1112+--let grep_pattern = ^# InnoDB_rec_lock_wait: \d*\.\d* InnoDB_queue_wait: \d*\.\d*\$
1113+--source include/log_grep.inc
1114+--let grep_pattern = ^# InnoDB_pages_distinct: \d+\$
1115+--source include/log_grep.inc
1116+--let grep_pattern = ^# No InnoDB statistics available for this query\$
1117+--source include/log_grep.inc
1118
1119=== modified file 'Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc'
1120--- Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc 2012-04-18 23:25:38 +0000
1121+++ Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc 2013-04-23 05:48:36 +0000
1122@@ -1,31 +1,26 @@
1123---let wait_condition=SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
1124 --connection default
1125---source include/log_start.inc
1126
1127+--source include/count_sessions.inc
1128 --connect (connection_one,localhost,root,,)
1129 --connect (connection_two,localhost,root,,)
1130 --connect (connection_three,localhost,root,,)
1131
1132+--source include/log_start.inc
1133+
1134 --let i=2
1135 --let k=1
1136
1137 while($i)
1138 {
1139 --connection connection_one
1140-SET SESSION query_exec_time=1.1;
1141-eval SET SESSION query_exec_id=$k;
1142 inc $k;
1143 SELECT 'connection_one';
1144
1145 --connection connection_two
1146-SET SESSION query_exec_time=1.1;
1147-eval SET SESSION query_exec_id=$k;
1148 inc $k;
1149 SELECT 'connection_two';
1150
1151 --connection connection_three
1152-SET SESSION query_exec_time=1.1;
1153-eval SET SESSION query_exec_id=$k;
1154 inc $k;
1155 SELECT 'connection_three';
1156
1157@@ -33,10 +28,10 @@
1158 }
1159
1160 --connection default
1161+--source include/log_stop.inc
1162 --disconnect connection_one
1163 --disconnect connection_two
1164 --disconnect connection_three
1165---source include/wait_condition.inc
1166---source include/log_stop.inc
1167+--source include/wait_until_count_sessions.inc
1168 --let log_slow_rate_test=1
1169 --source include/log_grep.inc
1170
1171=== modified file 'Percona-Server/mysql-test/include/query_response_time-replication.inc'
1172--- Percona-Server/mysql-test/include/query_response_time-replication.inc 2012-04-18 23:25:50 +0000
1173+++ Percona-Server/mysql-test/include/query_response_time-replication.inc 2013-04-23 05:48:36 +0000
1174@@ -2,7 +2,8 @@
1175
1176 CREATE TABLE t(id INT);
1177
1178-connection slave;
1179+sync_slave_with_master;
1180+
1181 SET GLOBAL query_exec_time = 0.1;
1182 --source include/restart_slave_sql.inc
1183
1184
1185=== modified file 'Percona-Server/mysql-test/lib/My/ConfigFactory.pm'
1186--- Percona-Server/mysql-test/lib/My/ConfigFactory.pm 2011-07-03 23:48:19 +0000
1187+++ Percona-Server/mysql-test/lib/My/ConfigFactory.pm 2013-04-23 05:48:36 +0000
1188@@ -31,8 +31,19 @@
1189 #
1190 # Rules to run first of all
1191 #
1192+
1193+sub add_opt_values {
1194+ my ($self, $config)= @_;
1195+
1196+ # add auto-options
1197+ $config->insert('OPT', 'port' => fix_port($self, $config) );
1198+ $config->insert('OPT', 'vardir' => sub { $self->{ARGS}->{vardir} });
1199+ $config->insert('mysqld', "loose-skip-$_" => undef) for (@::optional_plugins);
1200+}
1201+
1202 my @pre_rules=
1203 (
1204+ \&add_opt_values,
1205 );
1206
1207
1208@@ -89,8 +100,8 @@
1209
1210 sub fix_port {
1211 my ($self, $config, $group_name, $group)= @_;
1212- my $hostname= $group->value('#host');
1213- return $self->{HOSTS}->{$hostname}++;
1214+ my $port= $self->{PORT}++;
1215+ return $port;
1216 }
1217
1218 sub fix_host {
1219@@ -648,6 +659,7 @@
1220 my $self= bless {
1221 CONFIG => $config,
1222 ARGS => $args,
1223+ PORT => $args->{baseport},
1224 HOSTS => $hosts,
1225 NEXT_HOST => 0,
1226 SERVER_ID => 1,
1227
1228=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt'
1229--- Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt 2011-01-18 10:21:37 +0000
1230+++ Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt 2013-04-23 05:48:36 +0000
1231@@ -29,4 +29,4 @@
1232 IF(WIN32)
1233 INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
1234 ENDIF()
1235-INSTALL(FILES safe_process.pl Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
1236+INSTALL(FILES Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
1237
1238=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc'
1239--- Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc 2012-10-09 10:50:16 +0000
1240+++ Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc 2013-04-23 05:48:36 +0000
1241@@ -152,15 +152,19 @@
1242 pid_t own_pid= getpid();
1243 pid_t parent_pid= getppid();
1244 bool nocore = false;
1245- struct sigaction sigchld_action;
1246-
1247- sigchld_action.sa_handler= handle_signal;
1248- sigchld_action.sa_flags= SA_NOCLDSTOP;
1249+ struct sigaction sa,sa_abort;
1250+
1251+ sa.sa_handler= handle_signal;
1252+ sa.sa_flags= SA_NOCLDSTOP;
1253+ sigemptyset(&sa.sa_mask);
1254+
1255+ sa_abort.sa_handler= handle_abort;
1256+ sigemptyset(&sa_abort.sa_mask);
1257 /* Install signal handlers */
1258- signal(SIGTERM, handle_signal);
1259- signal(SIGINT, handle_signal);
1260- sigaction(SIGCHLD, &sigchld_action, NULL);
1261- signal(SIGABRT, handle_abort);
1262+ sigaction(SIGTERM, &sa,NULL);
1263+ sigaction(SIGINT, &sa,NULL);
1264+ sigaction(SIGCHLD, &sa,NULL);
1265+ sigaction(SIGABRT, &sa_abort,NULL);
1266
1267 sprintf(safe_process_name, "safe_process[%ld]", (long) own_pid);
1268
1269
1270=== removed file 'Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl'
1271--- Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl 2011-07-03 23:48:19 +0000
1272+++ Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl 1970-01-01 00:00:00 +0000
1273@@ -1,166 +0,0 @@
1274-#!/usr/bin/perl
1275-# -*- cperl -*-
1276-
1277-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
1278-#
1279-# This program is free software; you can redistribute it and/or modify
1280-# it under the terms of the GNU General Public License as published by
1281-# the Free Software Foundation; version 2 of the License.
1282-#
1283-# This program is distributed in the hope that it will be useful,
1284-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1285-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1286-# GNU General Public License for more details.
1287-#
1288-# You should have received a copy of the GNU General Public License
1289-# along with this program; if not, write to the Free Software
1290-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1291-
1292-use strict;
1293-use warnings;
1294-
1295-use lib 'lib';
1296-use My::SafeProcess::Base;
1297-use POSIX qw(WNOHANG);
1298-
1299-###########################################################################
1300-# Util functions
1301-###########################################################################
1302-
1303-#
1304-#Print message to stderr
1305-#
1306-my $verbose= 0;
1307-sub message {
1308- if ($verbose > 0){
1309- use Time::localtime;
1310- my $tm= localtime();
1311- my $timestamp= sprintf("%02d%02d%02d %2d:%02d:%02d",
1312- $tm->year % 100, $tm->mon+1, $tm->mday,
1313- $tm->hour, $tm->min, $tm->sec);
1314- print STDERR $timestamp, " monitor[$$]: ", @_, "\n";
1315- }
1316-}
1317-
1318-
1319-###########################################################################
1320-# Main program
1321-###########################################################################
1322-
1323-my $terminated= 0;
1324-
1325-# Protect against being killed in the middle
1326-# of child creation, just set the terminated flag
1327-# to make sure the child will be killed off
1328-# when program is ready to do that
1329-$SIG{TERM}= sub { message("!Got signal @_"); $terminated= 1; };
1330-$SIG{INT}= sub { message("!Got signal @_"); $terminated= 1; };
1331-
1332-my $parent_pid= getppid();
1333-
1334-my $found_double_dash= 0;
1335-while (my $arg= shift(@ARGV)){
1336-
1337- if ($arg =~ /^--$/){
1338- $found_double_dash= 1;
1339- last;
1340- }
1341- elsif ($arg =~ /^--verbose$/){
1342- $verbose= 1;
1343- }
1344- else {
1345- die "Unknown option: $arg";
1346- }
1347-}
1348-
1349-my $path= shift(@ARGV); # Executable
1350-
1351-die "usage:\n" .
1352- " safe_process.pl [opts] -- <path> [<args> [...<args_n>]]"
1353- unless defined $path || $found_double_dash;
1354-
1355-
1356-message("started");
1357-#message("path: '$path'");
1358-message("parent: $parent_pid");
1359-
1360-# Start process to monitor
1361-my $child_pid=
1362- create_process(
1363- path => $path,
1364- args => \@ARGV,
1365- setpgrp => 1,
1366- );
1367-message("Started child $child_pid");
1368-
1369-eval {
1370- sub handle_signal {
1371- $terminated= 1;
1372- message("Got signal @_");
1373-
1374- # Ignore all signals
1375- foreach my $name (keys %SIG){
1376- $SIG{$name}= 'IGNORE';
1377- }
1378-
1379- die "signaled\n";
1380- };
1381- local $SIG{TERM}= \&handle_signal;
1382- local $SIG{INT}= \&handle_signal;
1383- local $SIG{CHLD}= sub {
1384- message("Got signal @_");
1385- kill('KILL', -$child_pid);
1386- my $ret= waitpid($child_pid, 0);
1387- if ($? & 127){
1388- exit(65); # Killed by signal
1389- }
1390- exit($? >> 8);
1391- };
1392-
1393- # Monitoring loop
1394- while(!$terminated) {
1395-
1396- # Check if parent is still alive
1397- if (kill(0, $parent_pid) < 1){
1398- message("Parent is not alive anymore");
1399- last;
1400- }
1401-
1402- # Wait for child to terminate but wakeup every
1403- # second to also check that parent is still alive
1404- my $ret_pid;
1405- $ret_pid= waitpid($child_pid, &WNOHANG);
1406- if ($ret_pid == $child_pid) {
1407- # Process has exited, collect return status
1408- my $ret_code= $? >> 8;
1409- message("Child exit: $ret_code");
1410- # Exit with exit status of the child
1411- exit ($ret_code);
1412- }
1413- sleep(1);
1414- }
1415-};
1416-if ( $@ ) {
1417- # The monitoring loop should have been
1418- # broken by handle_signal
1419- warn "Unexpected: $@" unless ( $@ =~ /signaled/ );
1420-}
1421-
1422-# Use negative pid in order to kill the whole
1423-# process group
1424-#
1425-my $ret= kill('KILL', -$child_pid);
1426-message("Killed child: $child_pid, ret: $ret");
1427-if ($ret > 0) {
1428- message("Killed child: $child_pid");
1429- # Wait blocking for the child to return
1430- my $ret_pid= waitpid($child_pid, 0);
1431- if ($ret_pid != $child_pid){
1432- message("unexpected pid $ret_pid returned from waitpid($child_pid)");
1433- }
1434-}
1435-
1436-message("DONE!");
1437-exit (1);
1438-
1439-
1440
1441=== modified file 'Percona-Server/mysql-test/lib/mtr_cases.pm'
1442--- Percona-Server/mysql-test/lib/mtr_cases.pm 2013-01-21 21:48:22 +0000
1443+++ Percona-Server/mysql-test/lib/mtr_cases.pm 2013-04-23 05:48:36 +0000
1444@@ -963,18 +963,11 @@
1445 if ( $tinfo->{'ndb_test'} )
1446 {
1447 # This is a NDB test
1448- if ( $::opt_skip_ndbcluster == 2 )
1449- {
1450- # Ndb is not supported, skip it
1451- $tinfo->{'skip'}= 1;
1452- $tinfo->{'comment'}= "No ndbcluster support or ndb tests not enabled";
1453- return $tinfo;
1454- }
1455- elsif ( $::opt_skip_ndbcluster )
1456- {
1457- # All ndb test's should be skipped
1458- $tinfo->{'skip'}= 1;
1459- $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
1460+ if ( $::ndbcluster_enabled == 0)
1461+ {
1462+ # ndbcluster is disabled
1463+ $tinfo->{'skip'}= 1;
1464+ $tinfo->{'comment'}= "ndbcluster disabled";
1465 return $tinfo;
1466 }
1467 }
1468
1469=== modified file 'Percona-Server/mysql-test/lib/mtr_report.pm'
1470--- Percona-Server/mysql-test/lib/mtr_report.pm 2012-05-10 07:49:14 +0000
1471+++ Percona-Server/mysql-test/lib/mtr_report.pm 2013-04-23 05:48:36 +0000
1472@@ -28,7 +28,7 @@
1473 mtr_verbose_restart mtr_report_test_passed
1474 mtr_report_test_skipped mtr_print
1475 mtr_report_test_subunit
1476- mtr_report_test);
1477+ mtr_report_test isotime);
1478
1479 use mtr_match;
1480 use Subunit;
1481@@ -111,6 +111,8 @@
1482 $tinfo->{'result'}= 'MTR_RES_PASSED';
1483
1484 mtr_report_test($tinfo);
1485+
1486+ resfile_global("endtime ", isotime (time));
1487 }
1488
1489
1490@@ -598,4 +600,12 @@
1491 }
1492
1493
1494+# Used by --result-file for for formatting times
1495+
1496+sub isotime($) {
1497+ my ($sec,$min,$hr,$day,$mon,$yr)= gmtime($_[0]);
1498+ return sprintf "%d-%02d-%02dT%02d:%02d:%02dZ",
1499+ $yr+1900, $mon+1, $day, $hr, $min, $sec;
1500+}
1501+
1502 1;
1503
1504=== modified file 'Percona-Server/mysql-test/mysql-test-run.pl'
1505--- Percona-Server/mysql-test/mysql-test-run.pl 2013-01-09 23:45:25 +0000
1506+++ Percona-Server/mysql-test/mysql-test-run.pl 2013-04-23 05:48:36 +0000
1507@@ -312,8 +312,9 @@
1508
1509 our $opt_warnings= 1;
1510
1511-our $opt_include_ndbcluster= 0;
1512-our $opt_skip_ndbcluster= 1;
1513+our $ndbcluster_enabled= 0;
1514+my $opt_include_ndbcluster= 0;
1515+my $opt_skip_ndbcluster= 0;
1516
1517 my $exe_ndbd;
1518 my $exe_ndbmtd;
1519@@ -336,14 +337,6 @@
1520 select(STDOUT);
1521 $| = 1; # Automatically flush STDOUT
1522
1523-# Used by --result-file for for formatting times
1524-
1525-sub isotime($) {
1526- my ($sec,$min,$hr,$day,$mon,$yr)= gmtime($_[0]);
1527- return sprintf "%d-%02d-%02dT%02d:%02d:%02dZ",
1528- $yr+1900, $mon+1, $day, $hr, $min, $sec;
1529-}
1530-
1531 main();
1532
1533
1534@@ -367,26 +360,6 @@
1535
1536 if (!$opt_suites) {
1537 $opt_suites= $DEFAULT_SUITES;
1538-
1539- # Check for any extra suites to enable based on the path name
1540- my %extra_suites=
1541- (
1542- "mysql-5.1-new-ndb" => "ndb_team",
1543- "mysql-5.1-new-ndb-merge" => "ndb_team",
1544- "mysql-5.1-telco-6.2" => "ndb_team",
1545- "mysql-5.1-telco-6.2-merge" => "ndb_team",
1546- "mysql-5.1-telco-6.3" => "ndb_team",
1547- "mysql-6.0-ndb" => "ndb_team",
1548- );
1549-
1550- foreach my $dir ( reverse splitdir($basedir) ) {
1551- my $extra_suite= $extra_suites{$dir};
1552- if (defined $extra_suite) {
1553- mtr_report("Found extra suite: $extra_suite");
1554- $opt_suites= "$extra_suite,$opt_suites";
1555- last;
1556- }
1557- }
1558 }
1559 mtr_report("Using suites: $opt_suites") unless @opt_cases;
1560
1561@@ -410,7 +383,6 @@
1562 unshift(@$tests, $tinfo);
1563 }
1564
1565- print "vardir: $opt_vardir\n";
1566 initialize_servers();
1567
1568 #######################################################################
1569@@ -727,6 +699,10 @@
1570 else {
1571 mtr_report("\nRetrying test $tname, ".
1572 "attempt($retries/$opt_retry)...\n");
1573+ #saving the log file as filename.failed in case of retry
1574+ my $worker_logdir= $result->{savedir};
1575+ my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
1576+ rename $log_file_name,$log_file_name.".failed";
1577 delete($result->{result});
1578 $result->{retries}= $retries+1;
1579 $result->write_test($sock, 'TESTCASE');
1580@@ -1073,7 +1049,7 @@
1581 # Control what test suites or cases to run
1582 'force' => \$opt_force,
1583 'with-ndbcluster-only' => \&collect_option,
1584- 'include-ndbcluster' => \$opt_include_ndbcluster,
1585+ 'ndb|include-ndbcluster' => \$opt_include_ndbcluster,
1586 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
1587 'suite|suites=s' => \$opt_suites,
1588 'skip-rpl' => \&collect_option,
1589@@ -1523,7 +1499,6 @@
1590 }
1591 $ENV{'PATH'}= "$ENV{'PATH'}".$separator.$lib_mysqld;
1592 }
1593- $opt_skip_ndbcluster= 1; # Turn off use of NDB cluster
1594 $opt_skip_ssl= 1; # Turn off use of SSL
1595
1596 # Turn off use of bin log
1597@@ -2010,7 +1985,7 @@
1598
1599 $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded");
1600
1601- if ( ! $opt_skip_ndbcluster )
1602+ if ( $ndbcluster_enabled )
1603 {
1604 # Look for single threaded NDB
1605 $exe_ndbd=
1606@@ -2281,7 +2256,7 @@
1607 # --------------------------------------------------------------------------
1608 # Add the path where libndbclient can be found
1609 # --------------------------------------------------------------------------
1610- if ( !$opt_skip_ndbcluster )
1611+ if ( $ndbcluster_enabled )
1612 {
1613 push(@ld_library_paths, "$basedir/storage/ndb/src/.libs");
1614 }
1615@@ -2369,7 +2344,7 @@
1616 # ----------------------------------------------------
1617 # Setup env for NDB
1618 # ----------------------------------------------------
1619- if ( ! $opt_skip_ndbcluster )
1620+ if ( $ndbcluster_enabled )
1621 {
1622 $ENV{'NDB_MGM'}=
1623 my_find_bin($bindir,
1624@@ -2764,37 +2739,87 @@
1625 sub check_ndbcluster_support ($) {
1626 my $mysqld_variables= shift;
1627
1628+ my $ndbcluster_supported = 0;
1629+ if ($mysqld_variables{'ndb-connectstring'})
1630+ {
1631+ $ndbcluster_supported = 1;
1632+ }
1633+
1634+ if ($opt_skip_ndbcluster && $opt_include_ndbcluster)
1635+ {
1636+ # User is ambivalent. Theoretically the arg which was
1637+ # given last on command line should win, but that order is
1638+ # unknown at this time.
1639+ mtr_error("Ambigous command, both --include-ndbcluster " .
1640+ " and --skip-ndbcluster was specified");
1641+ }
1642+
1643 # Check if this is MySQL Cluster, ie. mysql version string ends
1644 # with -ndb-Y.Y.Y[-status]
1645 if ( defined $mysql_version_extra &&
1646- $mysql_version_extra =~ /^-ndb-/ )
1647- {
1648- mtr_report(" - MySQL Cluster");
1649- # Enable ndb engine and add more test suites
1650- $opt_include_ndbcluster = 1;
1651- $DEFAULT_SUITES.=",ndb";
1652- }
1653-
1654- if ($opt_include_ndbcluster)
1655- {
1656- $opt_skip_ndbcluster= 0;
1657- }
1658-
1659- if ($opt_skip_ndbcluster)
1660- {
1661- mtr_report(" - skipping ndbcluster");
1662- return;
1663- }
1664-
1665- if ( ! $mysqld_variables{'ndb-connectstring'} )
1666- {
1667- mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster");
1668- $opt_skip_ndbcluster= 2;
1669- return;
1670- }
1671-
1672- mtr_report(" - using ndbcluster when necessary, mysqld supports it");
1673-
1674+ $mysql_version_extra =~ /-ndb-([0-9]*)\.([0-9]*)\.([0-9]*)/ )
1675+ {
1676+ # MySQL Cluster tree
1677+ mtr_report(" - MySQL Cluster detected");
1678+
1679+ if ($opt_skip_ndbcluster)
1680+ {
1681+ mtr_report(" - skipping ndbcluster(--skip-ndbcluster)");
1682+ return;
1683+ }
1684+
1685+ if (!$ndbcluster_supported)
1686+ {
1687+ # MySQL Cluster tree, but mysqld was not compiled with
1688+ # ndbcluster -> fail unless --skip-ndbcluster was used
1689+ mtr_error("This is MySQL Cluster but mysqld does not " .
1690+ "support ndbcluster. Use --skip-ndbcluster to " .
1691+ "force mtr to run without it.");
1692+ }
1693+
1694+ # mysqld was compiled with ndbcluster -> auto enable
1695+ }
1696+ else
1697+ {
1698+ # Not a MySQL Cluster tree
1699+ if (!$ndbcluster_supported)
1700+ {
1701+ if ($opt_include_ndbcluster)
1702+ {
1703+ mtr_error("Could not detect ndbcluster support ".
1704+ "requested with --include-ndbcluster");
1705+ }
1706+
1707+ # Silently skip, mysqld was compiled without ndbcluster
1708+ # which is the default case
1709+ return;
1710+ }
1711+
1712+ if ($opt_skip_ndbcluster)
1713+ {
1714+ # Compiled with ndbcluster but ndbcluster skipped
1715+ mtr_report(" - skipping ndbcluster(--skip-ndbcluster)");
1716+ return;
1717+ }
1718+
1719+
1720+ # Not a MySQL Cluster tree, enable ndbcluster
1721+ # if --include-ndbcluster was used
1722+ if ($opt_include_ndbcluster)
1723+ {
1724+ # enable ndbcluster
1725+ }
1726+ else
1727+ {
1728+ mtr_report(" - skipping ndbcluster(disabled by default)");
1729+ return;
1730+ }
1731+ }
1732+
1733+ mtr_report(" - enabling ndbcluster");
1734+ $ndbcluster_enabled= 1;
1735+ # Add MySQL Cluster test suites
1736+ $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl,ndb_memcache";
1737 return;
1738 }
1739
1740
1741=== added file 'Percona-Server/mysql-test/r/aborted_clients.result'
1742--- Percona-Server/mysql-test/r/aborted_clients.result 1970-01-01 00:00:00 +0000
1743+++ Percona-Server/mysql-test/r/aborted_clients.result 2013-04-23 05:48:36 +0000
1744@@ -0,0 +1,10 @@
1745+FLUSH STATUS;
1746+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
1747+VARIABLE_VALUE
1748+0
1749+KILL CONNECTION_ID();
1750+ERROR 70100: Query execution was interrupted
1751+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
1752+VARIABLE_VALUE
1753+1
1754+FLUSH STATUS;
1755
1756=== added file 'Percona-Server/mysql-test/r/create_delayed.result'
1757--- Percona-Server/mysql-test/r/create_delayed.result 1970-01-01 00:00:00 +0000
1758+++ Percona-Server/mysql-test/r/create_delayed.result 2013-04-23 05:48:36 +0000
1759@@ -0,0 +1,3 @@
1760+drop table if exists t1;
1761+Starting test
1762+# All done
1763
1764=== modified file 'Percona-Server/mysql-test/r/ddl_i18n_koi8r.result'
1765--- Percona-Server/mysql-test/r/ddl_i18n_koi8r.result 2011-02-22 14:02:49 +0000
1766+++ Percona-Server/mysql-test/r/ddl_i18n_koi8r.result 2013-04-23 05:48:36 +0000
1767@@ -734,7 +734,7 @@
1768 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1769 /*!50003 SET sql_mode = '' */ ;
1770 DELIMITER ;;
1771-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p1`(
1772+CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
1773 INOUT ÐÁÒÁÍ1 CHAR(10),
1774 OUT ÐÁÒÁÍ2 CHAR(10))
1775 BEGIN
1776@@ -751,7 +751,7 @@
1777 @@character_set_client AS c8;
1778 SET ÐÁÒÁÍ1 = 'a';
1779 SET ÐÁÒÁÍ2 = 'b';
1780-END */;;
1781+END ;;
1782 DELIMITER ;
1783 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1784 /*!50003 SET character_set_client = @saved_cs_client */ ;
1785@@ -768,7 +768,7 @@
1786 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1787 /*!50003 SET sql_mode = '' */ ;
1788 DELIMITER ;;
1789-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p2`(
1790+CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
1791 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
1792 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
1793 BEGIN
1794@@ -785,7 +785,7 @@
1795 @@character_set_client AS c8;
1796 SET ÐÁÒÁÍ1 = 'a';
1797 SET ÐÁÒÁÍ2 = 'b';
1798-END */;;
1799+END ;;
1800 DELIMITER ;
1801 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1802 /*!50003 SET character_set_client = @saved_cs_client */ ;
1803@@ -810,7 +810,7 @@
1804 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1805 /*!50003 SET sql_mode = '' */ ;
1806 DELIMITER ;;
1807-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p3`(
1808+CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
1809 INOUT ÐÁÒÁÍ1 CHAR(10),
1810 OUT ÐÁÒÁÍ2 CHAR(10))
1811 BEGIN
1812@@ -827,7 +827,7 @@
1813 @@character_set_client AS c8;
1814 SET ÐÁÒÁÍ1 = 'a';
1815 SET ÐÁÒÁÍ2 = 'b';
1816-END */;;
1817+END ;;
1818 DELIMITER ;
1819 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1820 /*!50003 SET character_set_client = @saved_cs_client */ ;
1821@@ -844,7 +844,7 @@
1822 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1823 /*!50003 SET sql_mode = '' */ ;
1824 DELIMITER ;;
1825-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p4`(
1826+CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
1827 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
1828 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
1829 BEGIN
1830@@ -861,7 +861,7 @@
1831 @@character_set_client AS c8;
1832 SET ÐÁÒÁÍ1 = 'a';
1833 SET ÐÁÒÁÍ2 = 'b';
1834-END */;;
1835+END ;;
1836 DELIMITER ;
1837 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1838 /*!50003 SET character_set_client = @saved_cs_client */ ;
1839
1840=== modified file 'Percona-Server/mysql-test/r/ddl_i18n_utf8.result'
1841--- Percona-Server/mysql-test/r/ddl_i18n_utf8.result 2011-02-22 14:02:49 +0000
1842+++ Percona-Server/mysql-test/r/ddl_i18n_utf8.result 2013-04-23 05:48:36 +0000
1843@@ -734,7 +734,7 @@
1844 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1845 /*!50003 SET sql_mode = '' */ ;
1846 DELIMITER ;;
1847-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p1`(
1848+CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
1849 INOUT парам1 CHAR(10),
1850 OUT парам2 CHAR(10))
1851 BEGIN
1852@@ -751,7 +751,7 @@
1853 @@character_set_client AS c8;
1854 SET парам1 = 'a';
1855 SET парам2 = 'b';
1856-END */;;
1857+END ;;
1858 DELIMITER ;
1859 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1860 /*!50003 SET character_set_client = @saved_cs_client */ ;
1861@@ -768,7 +768,7 @@
1862 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1863 /*!50003 SET sql_mode = '' */ ;
1864 DELIMITER ;;
1865-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p2`(
1866+CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
1867 INOUT парам1 CHAR(10) CHARACTER SET utf8,
1868 OUT парам2 CHAR(10) CHARACTER SET utf8)
1869 BEGIN
1870@@ -785,7 +785,7 @@
1871 @@character_set_client AS c8;
1872 SET парам1 = 'a';
1873 SET парам2 = 'b';
1874-END */;;
1875+END ;;
1876 DELIMITER ;
1877 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1878 /*!50003 SET character_set_client = @saved_cs_client */ ;
1879@@ -810,7 +810,7 @@
1880 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1881 /*!50003 SET sql_mode = '' */ ;
1882 DELIMITER ;;
1883-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p3`(
1884+CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
1885 INOUT парам1 CHAR(10),
1886 OUT парам2 CHAR(10))
1887 BEGIN
1888@@ -827,7 +827,7 @@
1889 @@character_set_client AS c8;
1890 SET парам1 = 'a';
1891 SET парам2 = 'b';
1892-END */;;
1893+END ;;
1894 DELIMITER ;
1895 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1896 /*!50003 SET character_set_client = @saved_cs_client */ ;
1897@@ -844,7 +844,7 @@
1898 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1899 /*!50003 SET sql_mode = '' */ ;
1900 DELIMITER ;;
1901-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p4`(
1902+CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
1903 INOUT парам1 CHAR(10) CHARACTER SET utf8,
1904 OUT парам2 CHAR(10) CHARACTER SET utf8)
1905 BEGIN
1906@@ -861,7 +861,7 @@
1907 @@character_set_client AS c8;
1908 SET парам1 = 'a';
1909 SET парам2 = 'b';
1910-END */;;
1911+END ;;
1912 DELIMITER ;
1913 /*!50003 SET sql_mode = @saved_sql_mode */ ;
1914 /*!50003 SET character_set_client = @saved_cs_client */ ;
1915
1916=== modified file 'Percona-Server/mysql-test/r/group_min_max_innodb.result'
1917--- Percona-Server/mysql-test/r/group_min_max_innodb.result 2011-10-19 12:07:14 +0000
1918+++ Percona-Server/mysql-test/r/group_min_max_innodb.result 2013-04-23 05:48:36 +0000
1919@@ -70,7 +70,7 @@
1920 1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index; Using temporary
1921 explain select distinct f1, f2 from t1;
1922 id select_type table type possible_keys key key_len ref rows Extra
1923-1 SIMPLE t1 range NULL PRIMARY 5 NULL 3 Using index for group-by; Using temporary
1924+1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index
1925 drop table t1;
1926 create table t1(pk int primary key) engine=innodb;
1927 create view v1 as select pk from t1 where pk < 20;
1928
1929=== added file 'Percona-Server/mysql-test/r/have_pool_of_threads.require'
1930--- Percona-Server/mysql-test/r/have_pool_of_threads.require 1970-01-01 00:00:00 +0000
1931+++ Percona-Server/mysql-test/r/have_pool_of_threads.require 2013-04-23 05:48:36 +0000
1932@@ -0,0 +1,2 @@
1933+Variable_name Value
1934+thread_handling pool-of-threads
1935
1936=== modified file 'Percona-Server/mysql-test/r/mysqlbinlog.result'
1937--- Percona-Server/mysql-test/r/mysqlbinlog.result 2013-01-09 23:45:25 +0000
1938+++ Percona-Server/mysql-test/r/mysqlbinlog.result 2013-04-23 05:48:36 +0000
1939@@ -14,6 +14,7 @@
1940 flush logs;
1941
1942 --- Local --
1943+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1944 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1945 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1946 DELIMITER /*!*/;
1947@@ -95,8 +96,10 @@
1948 # End of log file
1949 ROLLBACK /* added by mysqlbinlog */;
1950 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
1951+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
1952
1953 --- Broken LOAD DATA --
1954+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1955 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1956 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1957 DELIMITER /*!*/;
1958@@ -131,8 +134,10 @@
1959 # End of log file
1960 ROLLBACK /* added by mysqlbinlog */;
1961 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
1962+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
1963
1964 --- --database --
1965+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1966 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1967 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1968 DELIMITER /*!*/;
1969@@ -186,8 +191,10 @@
1970 # End of log file
1971 ROLLBACK /* added by mysqlbinlog */;
1972 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
1973+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
1974
1975 --- --start-position --
1976+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1977 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1978 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1979 DELIMITER /*!*/;
1980@@ -213,8 +220,10 @@
1981 # End of log file
1982 ROLLBACK /* added by mysqlbinlog */;
1983 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
1984+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
1985
1986 --- Remote --
1987+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1988 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1989 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1990 DELIMITER /*!*/;
1991@@ -296,8 +305,10 @@
1992 # End of log file
1993 ROLLBACK /* added by mysqlbinlog */;
1994 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
1995+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
1996
1997 --- Broken LOAD DATA --
1998+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1999 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2000 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2001 DELIMITER /*!*/;
2002@@ -332,8 +343,10 @@
2003 # End of log file
2004 ROLLBACK /* added by mysqlbinlog */;
2005 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2006+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2007
2008 --- --database --
2009+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2010 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2011 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2012 DELIMITER /*!*/;
2013@@ -387,8 +400,10 @@
2014 # End of log file
2015 ROLLBACK /* added by mysqlbinlog */;
2016 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2017+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2018
2019 --- --start-position --
2020+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2021 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2022 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2023 DELIMITER /*!*/;
2024@@ -414,8 +429,10 @@
2025 # End of log file
2026 ROLLBACK /* added by mysqlbinlog */;
2027 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2028+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2029
2030 --- reading stdin --
2031+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2032 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2033 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2034 DELIMITER /*!*/;
2035@@ -435,6 +452,8 @@
2036 # End of log file
2037 ROLLBACK /* added by mysqlbinlog */;
2038 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2039+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2040+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2041 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2042 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2043 DELIMITER /*!*/;
2044@@ -453,6 +472,7 @@
2045 # End of log file
2046 ROLLBACK /* added by mysqlbinlog */;
2047 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2048+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2049 drop table t1,t2;
2050 flush logs;
2051 flush logs;
2052@@ -495,6 +515,7 @@
2053 drop procedure p1;
2054 call p1();
2055 ERROR 42000: PROCEDURE test.p1 does not exist
2056+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2057 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2058 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2059 DELIMITER /*!*/;
2060@@ -517,6 +538,7 @@
2061 # End of log file
2062 ROLLBACK /* added by mysqlbinlog */;
2063 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2064+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2065 call p1();
2066 1
2067 1
2068@@ -545,6 +567,7 @@
2069 D0AA
2070 drop table t1;
2071 flush logs;
2072+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2073 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2074 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2075 DELIMITER /*!*/;
2076@@ -634,6 +657,7 @@
2077 # End of log file
2078 ROLLBACK /* added by mysqlbinlog */;
2079 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2080+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2081 CREATE TABLE t1 (c1 CHAR(10));
2082 FLUSH LOGS;
2083 INSERT INTO t1 VALUES ('0123456789');
2084@@ -721,6 +745,7 @@
2085 FLUSH LOGS;
2086 #
2087 # Test if the 'BEGIN', 'ROLLBACK' and 'COMMIT' are output if the database specified exists
2088+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2089 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2090 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2091 DELIMITER /*!*/;
2092@@ -772,8 +797,10 @@
2093 # End of log file
2094 ROLLBACK /* added by mysqlbinlog */;
2095 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2096+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2097 #
2098 # Test if the 'BEGIN', 'ROLLBACK' and 'COMMIT' are output if the database specified does not exist
2099+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2100 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2101 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2102 DELIMITER /*!*/;
2103@@ -806,8 +833,10 @@
2104 # End of log file
2105 ROLLBACK /* added by mysqlbinlog */;
2106 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2107+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2108 #
2109 # Test if the 'SAVEPOINT', 'ROLLBACK TO' are output if the database specified exists
2110+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2111 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2112 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2113 DELIMITER /*!*/;
2114@@ -849,8 +878,10 @@
2115 # End of log file
2116 ROLLBACK /* added by mysqlbinlog */;
2117 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2118+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2119 #
2120 # Test if the 'SAVEPOINT', 'ROLLBACK TO' are output if the database specified does not exist
2121+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
2122 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
2123 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2124 DELIMITER /*!*/;
2125@@ -877,6 +908,7 @@
2126 # End of log file
2127 ROLLBACK /* added by mysqlbinlog */;
2128 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2129+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
2130 End of 5.0 tests
2131 End of 5.1 tests
2132 # Expect deprecation warning.
2133
2134=== modified file 'Percona-Server/mysql-test/r/mysqld--help-notwin.result'
2135--- Percona-Server/mysql-test/r/mysqld--help-notwin.result 2012-09-28 01:36:45 +0000
2136+++ Percona-Server/mysql-test/r/mysqld--help-notwin.result 2013-04-23 05:48:36 +0000
2137@@ -154,6 +154,11 @@
2138 With this option enabled you can run myisamchk to test
2139 (not repair) tables while the MySQL server is running.
2140 Disable with --skip-external-locking.
2141+ --extra-max-connections=#
2142+ The number of connections on extra-port
2143+ --extra-port=# Extra port number to use for tcp connections in a
2144+ one-thread-per-connection manner. 0 means don't use
2145+ another port
2146 --flashcache Enable flashcache detection.
2147 --flush Flush MyISAM tables to disk between SQL commands
2148 --flush-time=# A dedicated thread is created to flush all tables at the
2149@@ -719,8 +724,8 @@
2150 Timestamp is printed for all records of the slow log even
2151 if they are same time.
2152 --slow-query-log-timestamp-precision=name
2153- Log slow statements executed by stored procedure to the
2154- slow log if it is open. [second, microsecond]
2155+ Select the timestamp precision for use in the slow query
2156+ log. [second, microsecond]
2157 --slow-query-log-use-global-control=name
2158 Choose flags, wich always use the global variables.
2159 Multiple flags allowed in a comma-separated string.
2160@@ -770,7 +775,7 @@
2161 How many threads we should keep in a cache for reuse
2162 --thread-handling=name
2163 Define threads usage for handling queries, one of
2164- one-thread-per-connection, no-threads, loaded-dynamically
2165+ one-thread-per-connection, no-threads, pool-of-threads
2166 --thread-stack=# The stack size for each thread
2167 --thread-statistics Control TABLE_STATISTICS running, when userstat is
2168 enabled
2169@@ -861,6 +866,8 @@
2170 expand-fast-index-creation FALSE
2171 expire-logs-days 0
2172 external-locking FALSE
2173+extra-max-connections 1
2174+extra-port 0
2175 flashcache FALSE
2176 flush FALSE
2177 flush-time 0
2178
2179=== modified file 'Percona-Server/mysql-test/r/mysqld--help-win.result'
2180--- Percona-Server/mysql-test/r/mysqld--help-win.result 2012-09-28 01:36:45 +0000
2181+++ Percona-Server/mysql-test/r/mysqld--help-win.result 2013-04-23 05:48:36 +0000
2182@@ -154,6 +154,11 @@
2183 With this option enabled you can run myisamchk to test
2184 (not repair) tables while the MySQL server is running.
2185 Disable with --skip-external-locking.
2186+ --extra-max-connections=#
2187+ The number of connections on extra-port
2188+ --extra-port=# Extra port number to use for tcp connections in a
2189+ one-thread-per-connection manner. 0 means don't use
2190+ another port
2191 --flashcache Enable flashcache detection.
2192 --flush Flush MyISAM tables to disk between SQL commands
2193 --flush-time=# A dedicated thread is created to flush all tables at the
2194@@ -730,7 +735,7 @@
2195 How many threads we should keep in a cache for reuse
2196 --thread-handling=name
2197 Define threads usage for handling queries, one of
2198- one-thread-per-connection, no-threads, loaded-dynamically
2199+ one-thread-per-connection, no-threads, pool-of-threads
2200 --thread-stack=# The stack size for each thread
2201 --time-format=name The TIME format (ignored)
2202 --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
2203@@ -812,6 +817,8 @@
2204 expand-fast-index-creation FALSE
2205 expire-logs-days 0
2206 external-locking FALSE
2207+extra-max-connections 1
2208+extra-port 0
2209 flashcache FALSE
2210 flush FALSE
2211 flush-time 1800
2212
2213=== modified file 'Percona-Server/mysql-test/r/mysqldump.result'
2214--- Percona-Server/mysql-test/r/mysqldump.result 2012-11-28 05:09:57 +0000
2215+++ Percona-Server/mysql-test/r/mysqldump.result 2013-04-23 05:48:36 +0000
2216@@ -2706,8 +2706,8 @@
2217 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
2218 /*!50003 SET sql_mode = '' */ ;
2219 DELIMITER ;;
2220-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11)
2221-RETURN a+b */;;
2222+CREATE DEFINER=`root`@`localhost` FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11)
2223+RETURN a+b ;;
2224 DELIMITER ;
2225 /*!50003 SET sql_mode = @saved_sql_mode */ ;
2226 /*!50003 SET character_set_client = @saved_cs_client */ ;
2227@@ -2723,11 +2723,11 @@
2228 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
2229 /*!50003 SET sql_mode = '' */ ;
2230 DELIMITER ;;
2231-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 FUNCTION `bug9056_func2`(f1 char binary) RETURNS char(1) CHARSET latin1
2232+CREATE DEFINER=`root`@`localhost` FUNCTION `bug9056_func2`(f1 char binary) RETURNS char(1) CHARSET latin1
2233 begin
2234 set f1= concat( 'hello', f1 );
2235 return f1;
2236-end */;;
2237+end ;;
2238 DELIMITER ;
2239 /*!50003 SET sql_mode = @saved_sql_mode */ ;
2240 /*!50003 SET character_set_client = @saved_cs_client */ ;
2241@@ -2743,8 +2743,8 @@
2242 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
2243 /*!50003 SET sql_mode = 'REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI' */ ;
2244 DELIMITER ;;
2245-/*!50003 CREATE*/ /*!50020 DEFINER="root"@"localhost"*/ /*!50003 PROCEDURE "a'b"()
2246-select 1 */;;
2247+CREATE DEFINER="root"@"localhost" PROCEDURE "a'b"()
2248+select 1 ;;
2249 DELIMITER ;
2250 /*!50003 SET sql_mode = @saved_sql_mode */ ;
2251 /*!50003 SET character_set_client = @saved_cs_client */ ;
2252@@ -2760,8 +2760,8 @@
2253 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
2254 /*!50003 SET sql_mode = '' */ ;
2255 DELIMITER ;;
2256-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)
2257-BEGIN SELECT a+b INTO c; end */;;
2258+CREATE DEFINER=`root`@`localhost` PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)
2259+BEGIN SELECT a+b INTO c; end ;;
2260 DELIMITER ;
2261 /*!50003 SET sql_mode = @saved_sql_mode */ ;
2262 /*!50003 SET character_set_client = @saved_cs_client */ ;
2263@@ -2777,10 +2777,10 @@
2264 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
2265 /*!50003 SET sql_mode = '' */ ;
2266 DELIMITER ;;
2267-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc2`(OUT a INT)
2268+CREATE DEFINER=`root`@`localhost` PROCEDURE `bug9056_proc2`(OUT a INT)
2269 BEGIN
2270 select sum(id) from t1 into a;
2271-END */;;
2272+END ;;
2273 DELIMITER ;
2274 /*!50003 SET sql_mode = @saved_sql_mode */ ;
2275 /*!50003 SET character_set_client = @saved_cs_client */ ;
2276@@ -3766,8 +3766,8 @@
2277 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
2278 /*!50003 SET sql_mode = '' */ ;
2279 DELIMITER ;;
2280-/*!50003 CREATE*/ /*!50020 DEFINER=`user1`@`%`*/ /*!50003 PROCEDURE `sp1`()
2281-select 'hello' */;;
2282+CREATE DEFINER=`user1`@`%` PROCEDURE `sp1`()
2283+select 'hello' ;;
2284 DELIMITER ;
2285 /*!50003 SET sql_mode = @saved_sql_mode */ ;
2286 /*!50003 SET character_set_client = @saved_cs_client */ ;
2287@@ -5115,9 +5115,82 @@
2288 # Note : In the following dump the transaction
2289 # should start only after the logs are
2290 # flushed, as 'flush logs' causes implicit
2291-# commit starting 5.5.
2292+# commit starting 5.5.Also, as stderr is
2293+# unbuffered, it is redirected to a different
2294+# file to avoid diffs due to bad stdout/stderr
2295+# order in the output.
2296
2297 #### Dump starts here ####
2298+--
2299+-- Host: localhost Database: b12809202_db
2300+-- ------------------------------------------------------
2301+
2302+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
2303+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
2304+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
2305+/*!40101 SET NAMES utf8 */;
2306+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
2307+/*!40103 SET TIME_ZONE='+00:00' */;
2308+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
2309+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
2310+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
2311+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
2312+
2313+--
2314+-- Table structure for table `t1`
2315+--
2316+
2317+DROP TABLE IF EXISTS `t1`;
2318+/*!40101 SET @saved_cs_client = @@character_set_client */;
2319+/*!40101 SET character_set_client = utf8 */;
2320+CREATE TABLE `t1` (
2321+ `c1` int(11) DEFAULT NULL
2322+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
2323+/*!40101 SET character_set_client = @saved_cs_client */;
2324+
2325+--
2326+-- Dumping data for table `t1`
2327+--
2328+
2329+LOCK TABLES `t1` WRITE;
2330+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
2331+INSERT INTO `t1` VALUES (1),(2),(3);
2332+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
2333+UNLOCK TABLES;
2334+
2335+--
2336+-- Table structure for table `t2`
2337+--
2338+
2339+DROP TABLE IF EXISTS `t2`;
2340+/*!40101 SET @saved_cs_client = @@character_set_client */;
2341+/*!40101 SET character_set_client = utf8 */;
2342+CREATE TABLE `t2` (
2343+ `c1` int(11) DEFAULT NULL
2344+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
2345+/*!40101 SET character_set_client = @saved_cs_client */;
2346+
2347+--
2348+-- Dumping data for table `t2`
2349+--
2350+
2351+LOCK TABLES `t2` WRITE;
2352+/*!40000 ALTER TABLE `t2` DISABLE KEYS */;
2353+INSERT INTO `t2` VALUES (1),(2),(3);
2354+/*!40000 ALTER TABLE `t2` ENABLE KEYS */;
2355+UNLOCK TABLES;
2356+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
2357+
2358+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
2359+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
2360+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
2361+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
2362+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
2363+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
2364+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
2365+
2366+-- Dump completed
2367+## stderr ##
2368 -- Connecting to localhost...
2369 -- main : logs flushed successfully!
2370 -- Starting transaction...
2371
2372=== added file 'Percona-Server/mysql-test/r/percona_bug1127008.result'
2373--- Percona-Server/mysql-test/r/percona_bug1127008.result 1970-01-01 00:00:00 +0000
2374+++ Percona-Server/mysql-test/r/percona_bug1127008.result 2013-04-23 05:48:36 +0000
2375@@ -0,0 +1,28 @@
2376+#
2377+# Checking that CREATE IF NOT EXISTS is not blocked by running SELECT
2378+#
2379+create table t1 (a int, b int) engine=myisam;
2380+create table t2 (a int, b int) engine=myisam;
2381+insert into t1 values (1,1);
2382+lock tables t1 read;
2383+set @@lock_wait_timeout=5;
2384+create table if not exists t1 (a int, b int);
2385+Warnings:
2386+Note 1050 Table 't1' already exists
2387+create table if not exists t1 (a int, b int) select 2,2;
2388+Warnings:
2389+Note 1050 Table 't1' already exists
2390+create table if not exists t1 like t2;
2391+Warnings:
2392+Note 1050 Table 't1' already exists
2393+create table t1 (a int, b int);
2394+ERROR 42S01: Table 't1' already exists
2395+create table t1 (a int, b int) select 2,2;
2396+ERROR 42S01: Table 't1' already exists
2397+create table t1 like t2;
2398+ERROR 42S01: Table 't1' already exists
2399+select * from t1;
2400+a b
2401+1 1
2402+unlock tables;
2403+drop table t1,t2;
2404
2405=== added file 'Percona-Server/mysql-test/r/percona_bug643149.result'
2406--- Percona-Server/mysql-test/r/percona_bug643149.result 1970-01-01 00:00:00 +0000
2407+++ Percona-Server/mysql-test/r/percona_bug643149.result 2013-04-23 05:48:36 +0000
2408@@ -0,0 +1,21 @@
2409+SET @old_slow_query_log_file=@@global.slow_query_log_file;
2410+SET GLOBAL slow_query_log=on;
2411+SET LOCAL log_slow_verbosity='profiling';
2412+SET LOCAL long_query_time=0;
2413+SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug643149_slow.log';;
2414+SELECT 1;
2415+1
2416+1
2417+# User@Host: root[root] @ localhost []
2418+# Thread_id: X Schema: test Last_errno: X Killed: X
2419+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
2420+# Bytes_sent: X
2421+# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
2422+# Profile_total: X.X Profile_total_cpu: X.X
2423+# User@Host: root[root] @ localhost []
2424+# Thread_id: X Schema: test Last_errno: X Killed: X
2425+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
2426+# Bytes_sent: X
2427+# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
2428+# Profile_total: X.X Profile_total_cpu: X.X
2429+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
2430
2431=== removed file 'Percona-Server/mysql-test/r/percona_bug643149.result'
2432--- Percona-Server/mysql-test/r/percona_bug643149.result 2012-04-18 23:25:38 +0000
2433+++ Percona-Server/mysql-test/r/percona_bug643149.result 1970-01-01 00:00:00 +0000
2434@@ -1,21 +0,0 @@
2435-SET @old_slow_query_log_file=@@global.slow_query_log_file;
2436-SET GLOBAL slow_query_log=on;
2437-SET LOCAL log_slow_verbosity='profiling';
2438-SET LOCAL long_query_time=0;
2439-SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug643149_slow.log';;
2440-SELECT 1;
2441-1
2442-1
2443-# User@Host: root[root] @ localhost []
2444-# Thread_id: X Schema: test Last_errno: X Killed: X
2445-# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
2446-# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
2447-# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
2448-# Profile_total: X.X Profile_total_cpu: X.X
2449-# User@Host: root[root] @ localhost []
2450-# Thread_id: X Schema: test Last_errno: X Killed: X
2451-# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
2452-# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
2453-# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
2454-# Profile_total: X.X Profile_total_cpu: X.X
2455-SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
2456
2457=== modified file 'Percona-Server/mysql-test/r/percona_innodb_version.result'
2458--- Percona-Server/mysql-test/r/percona_innodb_version.result 2012-04-18 23:26:42 +0000
2459+++ Percona-Server/mysql-test/r/percona_innodb_version.result 2013-04-23 05:48:36 +0000
2460@@ -1,3 +1,3 @@
2461 SELECT @@innodb_version;
2462 @@innodb_version
2463-1.1.x-x.x
2464+5.5.x-x.x
2465
2466=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result'
2467--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result 1970-01-01 00:00:00 +0000
2468+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result 2013-04-23 05:48:36 +0000
2469@@ -0,0 +1,20 @@
2470+DROP TABLE IF EXISTS t1;
2471+CREATE TABLE t1 (a INT);
2472+SET SESSION min_examined_row_limit=0;
2473+SET SESSION long_query_time=0;
2474+SET GLOBAL log_slow_admin_statements=ON;
2475+[log_start.inc] percona_log_slow_admin_stmt_1
2476+ALTER TABLE t1 ADD INDEX a(a);
2477+[log_stop.inc] percona_log_slow_admin_stmt_1
2478+[log_grep.inc] file: percona_log_slow_admin_stmt_1 pattern: ALTER TABLE t1 ADD INDEX a\(a\);
2479+[log_grep.inc] lines: 1
2480+SET GLOBAL log_slow_admin_statements=OFF;
2481+[log_start.inc] percona_log_slow_admin_stmt_2
2482+ALTER TABLE t1 DROP INDEX a;
2483+[log_stop.inc] percona_log_slow_admin_stmt_2
2484+[log_grep.inc] file: percona_log_slow_admin_stmt_2 pattern: ALTER TABLE t1 DROP INDEX a;
2485+[log_grep.inc] lines: 0
2486+SET GLOBAL log_slow_admin_statements=default;
2487+SET SESSION long_query_time=default;
2488+SET SESSION min_examined_row_limit=default;
2489+DROP TABLE t1;
2490
2491=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result'
2492--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result 2012-04-18 23:25:38 +0000
2493+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result 1970-01-01 00:00:00 +0000
2494@@ -1,35 +0,0 @@
2495-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2496-Variable_name Value
2497-log_slow_admin_statements OFF
2498-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
2499-VARIABLE_NAME VARIABLE_VALUE
2500-LOG_SLOW_ADMIN_STATEMENTS OFF
2501-SET GLOBAL log_slow_admin_statements=true;
2502-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2503-Variable_name Value
2504-log_slow_admin_statements ON
2505-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
2506-VARIABLE_NAME VARIABLE_VALUE
2507-LOG_SLOW_ADMIN_STATEMENTS ON
2508-SET GLOBAL log_slow_admin_statements=false;
2509-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2510-Variable_name Value
2511-log_slow_admin_statements OFF
2512-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
2513-VARIABLE_NAME VARIABLE_VALUE
2514-LOG_SLOW_ADMIN_STATEMENTS OFF
2515-SET GLOBAL log_slow_admin_statements=foo;
2516-ERROR 42000: Variable 'log_slow_admin_statements' can't be set to the value of 'foo'
2517-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2518-Variable_name Value
2519-log_slow_admin_statements OFF
2520-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
2521-VARIABLE_NAME VARIABLE_VALUE
2522-LOG_SLOW_ADMIN_STATEMENTS OFF
2523-SET GLOBAL log_slow_admin_statements=default;
2524-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2525-Variable_name Value
2526-log_slow_admin_statements OFF
2527-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
2528-VARIABLE_NAME VARIABLE_VALUE
2529-LOG_SLOW_ADMIN_STATEMENTS OFF
2530
2531=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_filter.result'
2532--- Percona-Server/mysql-test/r/percona_log_slow_filter.result 2012-04-18 23:25:38 +0000
2533+++ Percona-Server/mysql-test/r/percona_log_slow_filter.result 1970-01-01 00:00:00 +0000
2534@@ -1,16 +0,0 @@
2535-CREATE TABLE t(id INT PRIMARY KEY);
2536-INSERT INTO t VALUES(1);
2537-INSERT INTO t VALUES(2);
2538-INSERT INTO t VALUES(3);
2539-SET long_query_time=1;
2540-SET log_slow_filter=full_join;
2541-[log_start.inc] percona.slow_extended.log_slow_filter
2542-SET query_exec_time = 1.1;
2543-SELECT * FROM t AS t1, t AS t2;
2544-SET query_exec_time = default;
2545-[log_stop.inc] percona.slow_extended.log_slow_filter
2546-SET log_slow_filter=default;
2547-SET long_query_time=default;
2548-[log_grep.inc] file: percona.slow_extended.log_slow_filter pattern: Query_time
2549-[log_grep.inc] lines: 1
2550-DROP TABLE t;
2551
2552=== added file 'Percona-Server/mysql-test/r/percona_log_slow_innodb.result'
2553--- Percona-Server/mysql-test/r/percona_log_slow_innodb.result 1970-01-01 00:00:00 +0000
2554+++ Percona-Server/mysql-test/r/percona_log_slow_innodb.result 2013-04-23 05:48:36 +0000
2555@@ -0,0 +1,42 @@
2556+DROP TABLE IF EXISTS t1, t2;
2557+CREATE TABLE t1(a INT) ENGINE=InnoDB;
2558+INSERT INTO t1 VALUE(1);
2559+CREATE TABLE t2(a INT) ENGINE=InnoDB;
2560+INSERT INTO t2 VALUE(1);
2561+SET SESSION min_examined_row_limit=0;
2562+SET SESSION long_query_time=0;
2563+SET @old_log_slow_verbosity := @@log_slow_verbosity;
2564+SET SESSION log_slow_verbosity='microtime,innodb';
2565+[log_start.inc] percona.slow_extended.innodb_0
2566+INSERT INTO t1 VALUES(2);
2567+INSERT INTO t2 VALUES(2);
2568+INSERT INTO t1 VALUES(3);
2569+SELECT 5;
2570+5
2571+5
2572+[log_stop.inc] percona.slow_extended.innodb_0
2573+LOCK TABLE t1 WRITE;
2574+[log_start.inc] percona.slow_extended.innodb_3
2575+LOCK TABLE t1 WRITE;
2576+SELECT SLEEP(5);
2577+SLEEP(5)
2578+0
2579+UNLOCK TABLES;
2580+[log_stop.inc] percona.slow_extended.innodb_3
2581+UNLOCK TABLES;
2582+BEGIN;
2583+SELECT * FROM t2 FOR UPDATE;
2584+a
2585+1
2586+2
2587+[log_start.inc] percona.slow_extended.innodb_4
2588+DELETE FROM t2 WHERE a=2;
2589+SELECT SLEEP(5);
2590+SLEEP(5)
2591+0
2592+COMMIT;
2593+[log_stop.inc] percona.slow_extended.innodb_4
2594+SET SESSION min_examined_row_limit=default;
2595+SET SESSION long_query_time=default;
2596+SET SESSION log_slow_verbosity=@old_log_slow_verbosity;
2597+DROP TABLE t1, t2;
2598
2599=== added file 'Percona-Server/mysql-test/r/percona_log_slow_query_plan.result'
2600--- Percona-Server/mysql-test/r/percona_log_slow_query_plan.result 1970-01-01 00:00:00 +0000
2601+++ Percona-Server/mysql-test/r/percona_log_slow_query_plan.result 2013-04-23 05:48:36 +0000
2602@@ -0,0 +1,268 @@
2603+FLUSH STATUS;
2604+DROP TABLE IF EXISTS t1;
2605+CREATE TABLE t1(
2606+a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
2607+b INT) ENGINE=InnoDB;
2608+INSERT INTO t1 VALUES(NULL, 10), (NULL, 5);
2609+SET SESSION long_query_time=0;
2610+SET SESSION min_examined_row_limit=0;
2611+SET SESSION log_slow_verbosity='microtime,query_plan';
2612+EXPLAIN SELECT * FROM t1;
2613+id select_type table type possible_keys key key_len ref rows Extra
2614+1 SIMPLE t1 ALL NULL NULL NULL NULL 2
2615+[log_start.inc] percona_slow_query_log.query_plan_0
2616+SELECT * FROM t1;
2617+a b
2618+1 10
2619+2 5
2620+[log_stop.inc] percona_slow_query_log.query_plan_0
2621+[log_grep.inc] file: percona_slow_query_log.query_plan_0 pattern: ^# Filesort: No Filesort_on_disk: No Merge_passes: 0$
2622+[log_grep.inc] lines: 2
2623+EXPLAIN SELECT * FROM t1 ORDER BY b;
2624+id select_type table type possible_keys key key_len ref rows Extra
2625+1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using filesort
2626+[log_start.inc] percona_slow_query_log.query_plan_1
2627+SELECT * FROM t1 ORDER BY b;
2628+a b
2629+2 5
2630+1 10
2631+[log_stop.inc] percona_slow_query_log.query_plan_1
2632+[log_grep.inc] file: percona_slow_query_log.query_plan_1 pattern: ^# Filesort: Yes Filesort_on_disk: No Merge_passes: 0$
2633+[log_grep.inc] lines: 1
2634+SET SESSION log_slow_filter='full_join,tmp_table,tmp_table_on_disk,filesort_on_disk';
2635+[log_start.inc] percona_slow_query_log.query_plan_1a
2636+SELECT * FROM t1 ORDER BY b;
2637+a b
2638+2 5
2639+1 10
2640+[log_stop.inc] percona_slow_query_log.query_plan_1a
2641+[log_grep.inc] file: percona_slow_query_log.query_plan_1a pattern: ^# Filesort: Yes Filesort_on_disk: No Merge_passes: 0$
2642+[log_grep.inc] lines: 0
2643+SET SESSION log_slow_filter=default;
2644+SET SESSION sort_buffer_size=32804;
2645+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
2646+INSERT INTO t2 VALUES (5), (16), (2), (17), (1);
2647+INSERT INTO t2 SELECT * FROM t2;
2648+INSERT INTO t2 SELECT * FROM t2;
2649+INSERT INTO t2 SELECT * FROM t2;
2650+INSERT INTO t2 SELECT * FROM t2;
2651+INSERT INTO t2 SELECT * FROM t2;
2652+INSERT INTO t2 SELECT * FROM t2;
2653+INSERT INTO t2 SELECT * FROM t2;
2654+INSERT INTO t2 SELECT * FROM t2;
2655+INSERT INTO t2 SELECT * FROM t2;
2656+SHOW SESSION STATUS LIKE 'Sort_merge_passes';
2657+Variable_name Value
2658+Sort_merge_passes 0
2659+EXPLAIN SELECT * FROM t2 ORDER BY a;
2660+id select_type table type possible_keys key key_len ref rows Extra
2661+1 SIMPLE t2 ALL NULL NULL NULL NULL ROWS Using filesort
2662+[log_start.inc] percona_slow_query_log.query_plan_2
2663+SELECT * FROM t2 ORDER BY a;
2664+[log_stop.inc] percona_slow_query_log.query_plan_2
2665+[log_grep.inc] file: percona_slow_query_log.query_plan_2 pattern: ^# Filesort: Yes Filesort_on_disk: Yes Merge_passes: 1$
2666+[log_grep.inc] lines: 1
2667+SHOW SESSION STATUS LIKE 'Sort_merge_passes';
2668+Variable_name Value
2669+Sort_merge_passes 1
2670+SET SESSION log_slow_filter='full_join,tmp_table,tmp_table_on_disk';
2671+[log_start.inc] percona_slow_query_log.query_plan_2a
2672+SELECT * FROM t2 ORDER BY a;
2673+[log_stop.inc] percona_slow_query_log.query_plan_2a
2674+[log_grep.inc] file: percona_slow_query_log.query_plan_2a pattern: ^# Filesort: Yes Filesort_on_disk: Yes Merge_passes: 1$
2675+[log_grep.inc] lines: 0
2676+SHOW SESSION STATUS LIKE 'Sort_merge_passes';
2677+Variable_name Value
2678+Sort_merge_passes 2
2679+SET SESSION log_slow_filter=default;
2680+INSERT INTO t2 SELECT * FROM t2;
2681+INSERT INTO t2 SELECT * FROM t2;
2682+INSERT INTO t2 SELECT * FROM t2;
2683+INSERT INTO t2 SELECT * FROM t2;
2684+[log_start.inc] percona_slow_query_log.query_plan_3
2685+SELECT * FROM t2 ORDER BY a;
2686+[log_stop.inc] percona_slow_query_log.query_plan_3
2687+[log_grep.inc] file: percona_slow_query_log.query_plan_3 pattern: ^# Filesort: Yes Filesort_on_disk: Yes Merge_passes: 4$
2688+[log_grep.inc] lines: 1
2689+SHOW SESSION STATUS LIKE 'Sort_merge_passes';
2690+Variable_name Value
2691+Sort_merge_passes 6
2692+SET SESSION sort_buffer_size=default;
2693+SHOW SESSION STATUS LIKE 'Select_scan';
2694+Variable_name Value
2695+Select_scan 37
2696+[log_start.inc] percona_slow_query_log.query_plan_4
2697+SELECT * FROM t1 WHERE a=1;
2698+a b
2699+1 10
2700+[log_stop.inc] percona_slow_query_log.query_plan_4
2701+[log_grep.inc] file: percona_slow_query_log.query_plan_4 pattern: ^#.*Full_scan: No.*$
2702+[log_grep.inc] lines: 2
2703+SHOW SESSION STATUS LIKE 'Select_scan';
2704+Variable_name Value
2705+Select_scan 40
2706+[log_start.inc] percona_slow_query_log.query_plan_5
2707+SELECT COUNT(*) FROM t1;
2708+COUNT(*)
2709+2
2710+[log_stop.inc] percona_slow_query_log.query_plan_5
2711+[log_grep.inc] file: percona_slow_query_log.query_plan_5 pattern: ^#.*Full_scan: Yes.*$
2712+[log_grep.inc] lines: 1
2713+SHOW SESSION STATUS LIKE 'Select_scan';
2714+Variable_name Value
2715+Select_scan 44
2716+SET SESSION log_slow_filter='full_join,tmp_table,tmp_table_on_disk,filesort,filesort_on_disk';
2717+[log_start.inc] percona_slow_query_log.query_plan_5a
2718+SELECT COUNT(*) FROM t1;
2719+COUNT(*)
2720+2
2721+[log_stop.inc] percona_slow_query_log.query_plan_5a
2722+[log_grep.inc] file: percona_slow_query_log.query_plan_5a pattern: ^#.*Full_scan: Yes.*$
2723+[log_grep.inc] lines: 0
2724+SHOW SESSION STATUS LIKE 'Select_scan';
2725+Variable_name Value
2726+Select_scan 48
2727+SET SESSION log_slow_filter=default;
2728+CREATE TABLE t3(a INT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
2729+INSERT INTO t3 VALUES (1), (2), (3);
2730+SHOW SESSION STATUS LIKE 'Select_full_join';
2731+Variable_name Value
2732+Select_full_join 0
2733+[log_start.inc] percona_slow_query_log.query_plan_6
2734+SELECT COUNT(*) FROM t1, t3 WHERE t1.a = t3.a;
2735+COUNT(*)
2736+2
2737+[log_stop.inc] percona_slow_query_log.query_plan_6
2738+[log_grep.inc] file: percona_slow_query_log.query_plan_6 pattern: ^#.*Full_join: No.*$
2739+[log_grep.inc] lines: 2
2740+SHOW SESSION STATUS LIKE 'Select_full_join';
2741+Variable_name Value
2742+Select_full_join 0
2743+[log_start.inc] percona_slow_query_log.query_plan_7
2744+SELECT COUNT(*) FROM t1, t2 WHERE t1.b = t2.a;
2745+COUNT(*)
2746+8192
2747+[log_stop.inc] percona_slow_query_log.query_plan_7
2748+[log_grep.inc] file: percona_slow_query_log.query_plan_7 pattern: ^#.*Full_join: Yes.*$
2749+[log_grep.inc] lines: 1
2750+SHOW SESSION STATUS LIKE 'Select_full_join';
2751+Variable_name Value
2752+Select_full_join 1
2753+SET SESSION log_slow_filter='tmp_table,tmp_table_on_disk,filesort,filesort_on_disk';
2754+[log_start.inc] percona_slow_query_log.query_plan_7a
2755+SELECT COUNT(*) FROM t1, t2 WHERE t1.b = t2.a;
2756+COUNT(*)
2757+8192
2758+[log_stop.inc] percona_slow_query_log.query_plan_7a
2759+[log_grep.inc] file: percona_slow_query_log.query_plan_7a pattern: ^#.*Full_join: Yes.*$
2760+[log_grep.inc] lines: 0
2761+SHOW SESSION STATUS LIKE 'Select_full_join';
2762+Variable_name Value
2763+Select_full_join 2
2764+SET SESSION log_slow_filter=default;
2765+SHOW SESSION STATUS LIKE 'Created_tmp_tables';
2766+Variable_name Value
2767+Created_tmp_tables 49
2768+SHOW SESSION STATUS LIKE 'Created_tmp_disk_tables';
2769+Variable_name Value
2770+Created_tmp_disk_tables 0
2771+EXPLAIN SELECT COUNT(*) FROM t1;
2772+id select_type table type possible_keys key key_len ref rows Extra
2773+1 SIMPLE t1 index NULL PRIMARY 4 NULL 2 Using index
2774+[log_start.inc] percona_slow_query_log.query_plan_8
2775+SELECT COUNT(*) FROM t1;
2776+COUNT(*)
2777+2
2778+[log_stop.inc] percona_slow_query_log.query_plan_8
2779+[log_grep.inc] file: percona_slow_query_log.query_plan_8 pattern: ^#.*Tmp_tables: 0 Tmp_disk_tables: 0 Tmp_table_sizes: 0$
2780+[log_grep.inc] lines: 2
2781+[log_grep.inc] file: percona_slow_query_log.query_plan_8 pattern: ^#.*Tmp_table: No Tmp_table_on_disk: No$
2782+[log_grep.inc] lines: 2
2783+SHOW SESSION STATUS LIKE 'Created_tmp_tables';
2784+Variable_name Value
2785+Created_tmp_tables 52
2786+SHOW SESSION STATUS LIKE 'Created_tmp_disk_tables';
2787+Variable_name Value
2788+Created_tmp_disk_tables 0
2789+EXPLAIN SELECT COUNT(*) FROM t1, t3 WHERE t1.a = t3.a GROUP BY t3.a;
2790+id select_type table type possible_keys key key_len ref rows Extra
2791+1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 2 Using index; Using temporary; Using filesort
2792+1 SIMPLE t3 eq_ref PRIMARY PRIMARY 4 test.t1.a 1 Using index
2793+[log_start.inc] percona_slow_query_log.query_plan_9
2794+SELECT COUNT(*) FROM t1, t3 WHERE t1.a = t3.a GROUP BY t3.a;
2795+COUNT(*)
2796+1
2797+1
2798+[log_stop.inc] percona_slow_query_log.query_plan_9
2799+[log_grep.inc] file: percona_slow_query_log.query_plan_9 pattern: ^#.*Tmp_tables: 1 Tmp_disk_tables: 0 Tmp_table_sizes: [1-9][0-9]*$
2800+[log_grep.inc] lines: 1
2801+[log_grep.inc] file: percona_slow_query_log.query_plan_9 pattern: ^#.*Tmp_table: Yes Tmp_table_on_disk: No$
2802+[log_grep.inc] lines: 1
2803+SHOW SESSION STATUS LIKE 'Created_tmp_tables';
2804+Variable_name Value
2805+Created_tmp_tables 56
2806+SHOW SESSION STATUS LIKE 'Created_tmp_disk_tables';
2807+Variable_name Value
2808+Created_tmp_disk_tables 0
2809+SET SESSION log_slow_filter='full_join,tmp_table_on_disk,filesort_on_disk';
2810+[log_start.inc] percona_slow_query_log.query_plan_9a
2811+SELECT COUNT(*) FROM t1, t3 WHERE t1.a = t3.a GROUP BY t3.a;
2812+COUNT(*)
2813+1
2814+1
2815+[log_stop.inc] percona_slow_query_log.query_plan_9a
2816+[log_grep.inc] file: percona_slow_query_log.query_plan_9a pattern: ^#.*Tmp_tables: 1 Tmp_disk_tables: 0 Tmp_table_sizes: [1-9][0-9]*$
2817+[log_grep.inc] lines: 0
2818+[log_grep.inc] file: percona_slow_query_log.query_plan_9a pattern: ^#.*Tmp_table: Yes Tmp_table_on_disk: No$
2819+[log_grep.inc] lines: 0
2820+SHOW SESSION STATUS LIKE 'Created_tmp_tables';
2821+Variable_name Value
2822+Created_tmp_tables 60
2823+SHOW SESSION STATUS LIKE 'Created_tmp_disk_tables';
2824+Variable_name Value
2825+Created_tmp_disk_tables 0
2826+SET SESSION log_slow_filter=default;
2827+CREATE TABLE t4(a INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
2828+INSERT INTO t4 VALUES (1, "aaa"), (2, "bbb"), (3, "ccc");
2829+EXPLAIN SELECT COUNT(*) FROM t1, t4 WHERE t1.a = t4.a GROUP BY t4.a;
2830+id select_type table type possible_keys key key_len ref rows Extra
2831+1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 2 Using index; Using temporary; Using filesort
2832+1 SIMPLE t4 eq_ref PRIMARY PRIMARY 4 test.t1.a 1 Using index
2833+[log_start.inc] percona_slow_query_log.query_plan_10
2834+SELECT COUNT(*) FROM t1, t4 WHERE t1.a = t4.a GROUP BY t4.b;
2835+COUNT(*)
2836+1
2837+1
2838+[log_stop.inc] percona_slow_query_log.query_plan_10
2839+[log_grep.inc] file: percona_slow_query_log.query_plan_10 pattern: ^#.*Tmp_tables: 1 Tmp_disk_tables: 1 Tmp_table_sizes: [1-9][0-9]*$
2840+[log_grep.inc] lines: 1
2841+[log_grep.inc] file: percona_slow_query_log.query_plan_10 pattern: ^#.*Tmp_table: Yes Tmp_table_on_disk: Yes$
2842+[log_grep.inc] lines: 1
2843+SHOW SESSION STATUS LIKE 'Created_tmp_tables';
2844+Variable_name Value
2845+Created_tmp_tables 64
2846+SHOW SESSION STATUS LIKE 'Created_tmp_disk_tables';
2847+Variable_name Value
2848+Created_tmp_disk_tables 1
2849+SET SESSION log_slow_filter='full_join,filesort_on_disk';
2850+[log_start.inc] percona_slow_query_log.query_plan_10a
2851+SELECT COUNT(*) FROM t1, t4 WHERE t1.a = t4.a GROUP BY t4.b;
2852+COUNT(*)
2853+1
2854+1
2855+[log_stop.inc] percona_slow_query_log.query_plan_10a
2856+[log_grep.inc] file: percona_slow_query_log.query_plan_10a pattern: ^#.*Tmp_tables: 1 Tmp_disk_tables: 1 Tmp_table_sizes: [1-9][0-9]*$
2857+[log_grep.inc] lines: 0
2858+[log_grep.inc] file: percona_slow_query_log.query_plan_10a pattern: ^#.*Tmp_table: Yes Tmp_table_on_disk: Yes$
2859+[log_grep.inc] lines: 0
2860+SHOW SESSION STATUS LIKE 'Created_tmp_tables';
2861+Variable_name Value
2862+Created_tmp_tables 68
2863+SHOW SESSION STATUS LIKE 'Created_tmp_disk_tables';
2864+Variable_name Value
2865+Created_tmp_disk_tables 2
2866+SET SESSION log_slow_filter=default;
2867+SET SESSION long_query_time=default;
2868+SET SESSION min_examined_row_limit=default;
2869+SET SESSION log_slow_verbosity=default;
2870+DROP TABLE t1, t2, t3, t4;
2871
2872=== added file 'Percona-Server/mysql-test/r/percona_log_slow_query_plan_qc.result'
2873--- Percona-Server/mysql-test/r/percona_log_slow_query_plan_qc.result 1970-01-01 00:00:00 +0000
2874+++ Percona-Server/mysql-test/r/percona_log_slow_query_plan_qc.result 2013-04-23 05:48:36 +0000
2875@@ -0,0 +1,46 @@
2876+FLUSH STATUS;
2877+SET SESSION min_examined_row_limit=0;
2878+DROP TABLE IF EXISTS t1;
2879+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
2880+INSERT INTO t1 VALUE(5);
2881+SET SESSION query_cache_type=1;
2882+SET GLOBAL query_cache_size=1355776;
2883+SET SESSION long_query_time=0;
2884+SET SESSION log_slow_verbosity='microtime,query_plan';
2885+[log_start.inc] percona_slow_query_log.query_plan_qc_1
2886+SELECT * FROM t1;
2887+a
2888+5
2889+[log_stop.inc] percona_slow_query_log.query_plan_qc_1
2890+[log_grep.inc] file: percona_slow_query_log.query_plan_qc_1 pattern: ^# QC_Hit: No.*$
2891+[log_grep.inc] lines: 2
2892+SHOW STATUS LIKE 'Qcache_hits';
2893+Variable_name Value
2894+Qcache_hits 0
2895+[log_start.inc] percona_slow_query_log.query_plan_qc_2
2896+SELECT * FROM t1;
2897+a
2898+5
2899+[log_stop.inc] percona_slow_query_log.query_plan_qc_2
2900+[log_grep.inc] file: percona_slow_query_log.query_plan_qc_2 pattern: ^# QC_Hit: Yes.*$
2901+[log_grep.inc] lines: 1
2902+SHOW STATUS LIKE 'Qcache_hits';
2903+Variable_name Value
2904+Qcache_hits 1
2905+SET SESSION log_slow_filter='full_join,tmp_table,tmp_table_on_disk,filesort,filesort_on_disk';
2906+[log_start.inc] percona_slow_query_log.query_plan_qc_3
2907+SELECT * FROM t1 WHERE a > 5;
2908+a
2909+[log_stop.inc] percona_slow_query_log.query_plan_qc_3
2910+[log_grep.inc] file: percona_slow_query_log.query_plan_qc_3 pattern: ^# QC_Hit: No.*$
2911+[log_grep.inc] lines: 0
2912+SHOW STATUS LIKE 'Qcache_hits';
2913+Variable_name Value
2914+Qcache_hits 1
2915+SET SESSION log_slow_filter=default;
2916+SET SESSION long_query_time=default;
2917+SET SESSION log_slow_verbosity=default;
2918+SET SESSION query_cache_type=default;
2919+SET GLOBAL query_cache_size=default;
2920+SET SESSION min_examined_row_limit=default;
2921+DROP TABLE t1;
2922
2923=== added file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result'
2924--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result 1970-01-01 00:00:00 +0000
2925+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result 2013-04-23 05:48:36 +0000
2926@@ -0,0 +1,28 @@
2927+include/master-slave.inc
2928+[connection master]
2929+SET SESSION min_examined_row_limit=0;
2930+DROP TABLE IF EXISTS t;
2931+CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
2932+INSERT INTO t VALUES
2933+(1,"aaaaabbbbbcccccdddddeeeeefffff"),
2934+(2,"aaaaabbbbbcccccdddddeeeeefffff"),
2935+(3,"aaaaabbbbbcccccdddddeeeeefffff"),
2936+(4,"aaaaabbbbbcccccdddddeeeeefffff"),
2937+(5,"aaaaabbbbbcccccdddddeeeeefffff");
2938+INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
2939+INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
2940+SET GLOBAL long_query_time=0;
2941+SET GLOBAL log_slow_slave_statements=TRUE;
2942+SET GLOBAL log_slow_verbosity='innodb';
2943+include/restart_slave.inc
2944+[log_start.inc] percona.slow_extended.log_slow_slave_statements-innodb
2945+INSERT INTO t SELECT t.id,t.data from t;
2946+[log_stop.inc] percona.slow_extended.log_slow_slave_statements-innodb
2947+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements-innodb pattern: InnoDB_IO_r_ops
2948+[log_grep.inc] lines: 1
2949+DROP TABLE t;
2950+SET GLOBAL long_query_time=default;
2951+SET GLOBAL log_slow_slave_statements=default;
2952+SET GLOBAL log_slow_verbosity=default;
2953+SET SESSION min_examined_row_limit=default;
2954+include/rpl_end.inc
2955
2956=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result'
2957--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result 2012-04-18 23:25:38 +0000
2958+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result 1970-01-01 00:00:00 +0000
2959@@ -1,19 +0,0 @@
2960-include/master-slave.inc
2961-[connection master]
2962-DROP TABLE IF EXISTS t;
2963-CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
2964-INSERT INTO t VALUES
2965-(1,"aaaaabbbbbcccccdddddeeeeefffff"),
2966-(2,"aaaaabbbbbcccccdddddeeeeefffff"),
2967-(3,"aaaaabbbbbcccccdddddeeeeefffff"),
2968-(4,"aaaaabbbbbcccccdddddeeeeefffff"),
2969-(5,"aaaaabbbbbcccccdddddeeeeefffff");
2970-INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
2971-INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
2972-[log_start.inc] percona.slow_extended.log_slow_slave_statements-innodb
2973-INSERT INTO t SELECT t.id,t.data from t;
2974-[log_stop.inc] percona.slow_extended.log_slow_slave_statements-innodb
2975-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements-innodb pattern: InnoDB_IO_r_ops
2976-[log_grep.inc] lines: 1
2977-DROP TABLE t;
2978-include/rpl_end.inc
2979
2980=== added file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result'
2981--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result 1970-01-01 00:00:00 +0000
2982+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result 2013-04-23 05:48:36 +0000
2983@@ -0,0 +1,30 @@
2984+include/master-slave.inc
2985+[connection master]
2986+DROP TABLE IF EXISTS t;
2987+CREATE TABLE t(id INT) ENGINE=InnoDB;
2988+SET GLOBAL min_examined_row_limit=0;
2989+SET GLOBAL long_query_time=0;
2990+SET GLOBAL log_slow_slave_statements=OFF;
2991+include/restart_slave.inc
2992+[log_start.inc] percona.slow_extended.log_slow_slave_statements
2993+INSERT INTO t VALUES (1);
2994+SET GLOBAL log_slow_slave_statements=ON;
2995+BEGIN;
2996+INSERT INTO t VALUES (2);
2997+COMMIT;
2998+SET GLOBAL log_slow_slave_statements=OFF;
2999+INSERT INTO t VALUES (3);
3000+[log_stop.inc] percona.slow_extended.log_slow_slave_statements
3001+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(1\)
3002+[log_grep.inc] lines: 0
3003+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(2\)
3004+[log_grep.inc] lines: 1
3005+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(3\)
3006+[log_grep.inc] lines: 0
3007+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: ^# User@Host: \[SQL_SLAVE\] @ \[\]
3008+[log_grep.inc] lines: 2
3009+DROP TABLE t;
3010+SET GLOBAL log_slow_slave_statements=default;
3011+SET GLOBAL long_query_time=default;
3012+SET GLOBAL min_examined_row_limit=default;
3013+include/rpl_end.inc
3014
3015=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result'
3016--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result 2012-04-18 23:25:38 +0000
3017+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result 1970-01-01 00:00:00 +0000
3018@@ -1,45 +0,0 @@
3019-include/master-slave.inc
3020-[connection master]
3021-DROP TABLE IF EXISTS t;
3022-CREATE TABLE t(id INT);
3023-[log_start.inc] percona.slow_extended.log_slow_slave_statements
3024-LINE 1
3025-LOG_SLOW_SLAVE_STATAMENTS is OFF
3026-LOG_SLOW_SLAVE_STATEMENTS=ON
3027-LOG_SLOW_SLAVE_STATAMENTS is ON
3028-LINE 2
3029-include/restart_slave.inc
3030-LOG_SLOW_SLAVE_STATAMENTS is ON
3031-LINE 3
3032-LOG_SLOW_SLAVE_STATAMENTS is ON
3033-LOG_SLOW_SLAVE_STATEMENTS=OFF
3034-LOG_SLOW_SLAVE_STATAMENTS is OFF
3035-LINE 4
3036-include/restart_slave.inc
3037-LOG_SLOW_SLAVE_STATAMENTS is OFF
3038-LINE 5
3039-LOG_SLOW_SLAVE_STATAMENTS is OFF
3040-LOG_SLOW_SLAVE_STATEMENTS=ON
3041-LOG_SLOW_SLAVE_STATAMENTS is ON
3042-LINE 6
3043-include/restart_slave.inc
3044-LOG_SLOW_SLAVE_STATAMENTS is ON
3045-LINE 7
3046-[log_stop.inc] percona.slow_extended.log_slow_slave_statements
3047-SET GLOBAL log_slow_slave_statements=default;
3048-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(1\)
3049-[log_grep.inc] lines: 0
3050-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(2\)
3051-[log_grep.inc] lines: 0
3052-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(3\)
3053-[log_grep.inc] lines: 1
3054-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(4\)
3055-[log_grep.inc] lines: 0
3056-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(5\)
3057-[log_grep.inc] lines: 0
3058-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(6\)
3059-[log_grep.inc] lines: 0
3060-[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(7\)
3061-[log_grep.inc] lines: 1
3062-DROP TABLE t;
3063-include/rpl_end.inc
3064
3065=== added file 'Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result'
3066--- Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result 1970-01-01 00:00:00 +0000
3067+++ Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result 2013-04-23 05:48:36 +0000
3068@@ -0,0 +1,29 @@
3069+DROP PROCEDURE IF EXISTS test_f;
3070+SET SESSION min_examined_row_limit=0;
3071+SET SESSION long_query_time=0;
3072+SET SESSION query_cache_type=0;
3073+CREATE PROCEDURE test_f()
3074+BEGIN
3075+SELECT 1;
3076+END^
3077+SET GLOBAL log_slow_sp_statements=ON;
3078+[log_start.inc] percona.slow_extended.sp1
3079+CALL test_f();
3080+1
3081+1
3082+[log_stop.inc] percona.slow_extended.sp1
3083+[log_grep.inc] file: percona.slow_extended.sp1 pattern: SELECT 1;
3084+[log_grep.inc] lines: 1
3085+SET GLOBAL log_slow_sp_statements=OFF;
3086+[log_start.inc] percona.slow_extended.sp2
3087+CALL test_f();
3088+1
3089+1
3090+[log_stop.inc] percona.slow_extended.sp2
3091+[log_grep.inc] file: percona.slow_extended.sp2 pattern: SELECT 1;
3092+[log_grep.inc] lines: 0
3093+DROP PROCEDURE test_f;
3094+SET GLOBAL log_slow_sp_statements=default;
3095+SET SESSION long_query_time=default;
3096+SET SESSION min_examined_row_limit=default;
3097+SET SESSION query_cache_type=default;
3098
3099=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result'
3100--- Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result 2012-04-18 23:25:38 +0000
3101+++ Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result 1970-01-01 00:00:00 +0000
3102@@ -1,25 +0,0 @@
3103-SET long_query_time=1;
3104-SET GLOBAL log_slow_sp_statements=ON;
3105-SET SESSION query_exec_time=0.1;
3106-[log_start.inc] percona.slow_extended.log_slow_sp_statements
3107-CREATE PROCEDURE test_f()
3108-BEGIN
3109-SET SESSION query_exec_time=1.1; SELECT 1;
3110-SET SESSION query_exec_time=2.1; SELECT 1;
3111-SET SESSION query_exec_time=3.1; SELECT 1;
3112-SET SESSION query_exec_time=0.1;
3113-END^
3114-CALL test_f();
3115-1
3116-1
3117-1
3118-1
3119-1
3120-1
3121-[log_stop.inc] percona.slow_extended.log_slow_sp_statements
3122-SET SESSION query_exec_time=default;
3123-SET GLOBAL log_slow_sp_statements=default;
3124-SET long_query_time=default;
3125-[log_grep.inc] file: percona.slow_extended.log_slow_sp_statements pattern: Query_time
3126-[log_grep.inc] lines: 3
3127-DROP PROCEDURE test_f;
3128
3129=== added file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity.result'
3130--- Percona-Server/mysql-test/r/percona_log_slow_verbosity.result 1970-01-01 00:00:00 +0000
3131+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity.result 2013-04-23 05:48:36 +0000
3132@@ -0,0 +1,118 @@
3133+DROP TABLE IF EXISTS t1;
3134+CREATE TABLE t1(a INT) ENGINE=InnoDB;
3135+SET SESSION min_examined_row_limit=0;
3136+SET SESSION long_query_time=0;
3137+SET SESSION log_slow_verbosity='microtime,innodb,query_plan';
3138+[log_start.inc] percona.slow_extended.log_slow_verbosity_0
3139+INSERT INTO t1 VALUE(0);
3140+[log_stop.inc] percona.slow_extended.log_slow_verbosity_0
3141+log_slow_verbosity='microtime,innodb,query_plan':
3142+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# Thread_id: \d+ Schema: .+ Last_errno: \d+ Killed: \d+$
3143+[log_grep.inc] lines: 2
3144+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
3145+[log_grep.inc] lines: 2
3146+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# Bytes_sent: \d+.*$
3147+[log_grep.inc] lines: 2
3148+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# InnoDB_trx_id: \w+$
3149+[log_grep.inc] lines: 1
3150+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# Bytes_sent: \d+ Tmp_tables: \d+ Tmp_disk_tables: \d+ Tmp_table_sizes: \d+$
3151+[log_grep.inc] lines: 2
3152+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# QC_Hit: (Yes|No) Full_scan: (Yes|No) Full_join: (Yes|No) Tmp_table: (Yes|No) Tmp_table_on_disk: (Yes|No)$
3153+[log_grep.inc] lines: 2
3154+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# Filesort: (Yes|No) Filesort_on_disk: (Yes|No) Merge_passes: \d+$
3155+[log_grep.inc] lines: 2
3156+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# InnoDB_IO_r_ops: \d+ InnoDB_IO_r_bytes: \d+ InnoDB_IO_r_wait: \d*\.\d*$
3157+[log_grep.inc] lines: 1
3158+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# InnoDB_rec_lock_wait: \d*\.\d* InnoDB_queue_wait: \d*\.\d*$
3159+[log_grep.inc] lines: 1
3160+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# InnoDB_pages_distinct: \d+$
3161+[log_grep.inc] lines: 1
3162+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# No InnoDB statistics available for this query$
3163+[log_grep.inc] lines: 1
3164+SET SESSION log_slow_verbosity='microtime,innodb,query_plan';
3165+[log_start.inc] percona.slow_extended.log_slow_verbosity_1
3166+SELECT 1;
3167+1
3168+1
3169+[log_stop.inc] percona.slow_extended.log_slow_verbosity_1
3170+log_slow_verbosity='microtime,innodb,query_plan':
3171+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# Thread_id: \d+ Schema: .+ Last_errno: \d+ Killed: \d+$
3172+[log_grep.inc] lines: 2
3173+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
3174+[log_grep.inc] lines: 2
3175+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# Bytes_sent: \d+.*$
3176+[log_grep.inc] lines: 2
3177+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# InnoDB_trx_id: \w+$
3178+[log_grep.inc] lines: 0
3179+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# Bytes_sent: \d+ Tmp_tables: \d+ Tmp_disk_tables: \d+ Tmp_table_sizes: \d+$
3180+[log_grep.inc] lines: 2
3181+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# QC_Hit: (Yes|No) Full_scan: (Yes|No) Full_join: (Yes|No) Tmp_table: (Yes|No) Tmp_table_on_disk: (Yes|No)$
3182+[log_grep.inc] lines: 2
3183+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# Filesort: (Yes|No) Filesort_on_disk: (Yes|No) Merge_passes: \d+$
3184+[log_grep.inc] lines: 2
3185+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# InnoDB_IO_r_ops: \d+ InnoDB_IO_r_bytes: \d+ InnoDB_IO_r_wait: \d*\.\d*$
3186+[log_grep.inc] lines: 0
3187+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# InnoDB_rec_lock_wait: \d*\.\d* InnoDB_queue_wait: \d*\.\d*$
3188+[log_grep.inc] lines: 0
3189+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# InnoDB_pages_distinct: \d+$
3190+[log_grep.inc] lines: 0
3191+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# No InnoDB statistics available for this query$
3192+[log_grep.inc] lines: 2
3193+SET log_slow_verbosity='microtime';
3194+[log_start.inc] percona.slow_extended.log_slow_verbosity_2
3195+INSERT INTO t1 VALUE(1);
3196+[log_stop.inc] percona.slow_extended.log_slow_verbosity_2
3197+log_slow_verbosity='microtime':
3198+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# Thread_id: \d+ Schema: .+ Last_errno: \d+ Killed: \d+$
3199+[log_grep.inc] lines: 2
3200+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
3201+[log_grep.inc] lines: 2
3202+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# Bytes_sent: \d+.*$
3203+[log_grep.inc] lines: 2
3204+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# InnoDB_trx_id: \w+$
3205+[log_grep.inc] lines: 0
3206+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# Bytes_sent: \d+ Tmp_tables: \d+ Tmp_disk_tables: \d+ Tmp_table_sizes: \d+$
3207+[log_grep.inc] lines: 0
3208+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# QC_Hit: (Yes|No) Full_scan: (Yes|No) Full_join: (Yes|No) Tmp_table: (Yes|No) Tmp_table_on_disk: (Yes|No)$
3209+[log_grep.inc] lines: 0
3210+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# Filesort: (Yes|No) Filesort_on_disk: (Yes|No) Merge_passes: \d+$
3211+[log_grep.inc] lines: 0
3212+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# InnoDB_IO_r_ops: \d+ InnoDB_IO_r_bytes: \d+ InnoDB_IO_r_wait: \d*\.\d*$
3213+[log_grep.inc] lines: 0
3214+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# InnoDB_rec_lock_wait: \d*\.\d* InnoDB_queue_wait: \d*\.\d*$
3215+[log_grep.inc] lines: 0
3216+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# InnoDB_pages_distinct: \d+$
3217+[log_grep.inc] lines: 0
3218+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# No InnoDB statistics available for this query$
3219+[log_grep.inc] lines: 0
3220+SET log_slow_verbosity='microtime,query_plan';
3221+[log_start.inc] percona.slow_extended.log_slow_verbosity_3
3222+INSERT INTO t1 VALUE(2);
3223+[log_stop.inc] percona.slow_extended.log_slow_verbosity_3
3224+log_slow_verbosity='query_plan':
3225+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# Thread_id: \d+ Schema: .+ Last_errno: \d+ Killed: \d+$
3226+[log_grep.inc] lines: 2
3227+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
3228+[log_grep.inc] lines: 2
3229+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# Bytes_sent: \d+.*$
3230+[log_grep.inc] lines: 2
3231+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# InnoDB_trx_id: \w+$
3232+[log_grep.inc] lines: 0
3233+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# Bytes_sent: \d+ Tmp_tables: \d+ Tmp_disk_tables: \d+ Tmp_table_sizes: \d+$
3234+[log_grep.inc] lines: 2
3235+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# QC_Hit: (Yes|No) Full_scan: (Yes|No) Full_join: (Yes|No) Tmp_table: (Yes|No) Tmp_table_on_disk: (Yes|No)$
3236+[log_grep.inc] lines: 2
3237+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# Filesort: (Yes|No) Filesort_on_disk: (Yes|No) Merge_passes: \d+$
3238+[log_grep.inc] lines: 2
3239+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# InnoDB_IO_r_ops: \d+ InnoDB_IO_r_bytes: \d+ InnoDB_IO_r_wait: \d*\.\d*$
3240+[log_grep.inc] lines: 0
3241+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# InnoDB_rec_lock_wait: \d*\.\d* InnoDB_queue_wait: \d*\.\d*$
3242+[log_grep.inc] lines: 0
3243+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# InnoDB_pages_distinct: \d+$
3244+[log_grep.inc] lines: 0
3245+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# No InnoDB statistics available for this query$
3246+[log_grep.inc] lines: 0
3247+SET SESSION log_slow_verbosity=default;
3248+SET SESSION long_query_time=default;
3249+SET SESSION min_examined_row_limit=default;
3250+DROP TABLE t1;
3251
3252=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity.result'
3253--- Percona-Server/mysql-test/r/percona_log_slow_verbosity.result 2012-04-18 23:25:38 +0000
3254+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity.result 1970-01-01 00:00:00 +0000
3255@@ -1,16 +0,0 @@
3256-SET SESSION long_query_time=1;
3257-[log_start.inc] percona.slow_extended.log_slow_verbosity
3258-SET SESSION query_exec_time=2.1;
3259-SELECT 1;
3260-1
3261-1
3262-SET SESSION log_slow_verbosity=innodb;
3263-SELECT 1;
3264-1
3265-1
3266-SET SESSION query_exec_time=default;
3267-[log_stop.inc] percona.slow_extended.log_slow_verbosity
3268-SET log_slow_verbosity=default;
3269-SET long_query_time=default;
3270-[log_grep.inc] file: percona.slow_extended.log_slow_verbosity pattern: No InnoDB statistics available for this query
3271-[log_grep.inc] lines: 1
3272
3273=== added file 'Percona-Server/mysql-test/r/percona_long_query_time.result'
3274--- Percona-Server/mysql-test/r/percona_long_query_time.result 1970-01-01 00:00:00 +0000
3275+++ Percona-Server/mysql-test/r/percona_long_query_time.result 2013-04-23 05:48:36 +0000
3276@@ -0,0 +1,35 @@
3277+SET SESSION min_examined_row_limit=0;
3278+SET long_query_time=2;
3279+[log_start.inc] percona.slow_extended.long_query_time
3280+SET SESSION query_exec_time=1.1;
3281+SELECT 1;
3282+1
3283+1
3284+SET SESSION query_exec_time=3.1;
3285+SELECT 1;
3286+1
3287+1
3288+SET SESSION query_exec_time=5.1;
3289+SELECT 1;
3290+1
3291+1
3292+SET long_query_time=4;
3293+SET SESSION query_exec_time=1.1;
3294+SELECT 1;
3295+1
3296+1
3297+SET SESSION query_exec_time=3.1;
3298+SELECT 1;
3299+1
3300+1
3301+SET SESSION query_exec_time=5.1;
3302+SELECT 1;
3303+1
3304+1
3305+SET SESSION query_exec_time=default;
3306+SET long_query_time=2;
3307+[log_stop.inc] percona.slow_extended.long_query_time
3308+SET long_query_time=default;
3309+SET SESSION min_examined_row_limit=default;
3310+[log_grep.inc] file: percona.slow_extended.long_query_time pattern: Query_time
3311+[log_grep.inc] lines: 3
3312
3313=== removed file 'Percona-Server/mysql-test/r/percona_long_query_time.result'
3314--- Percona-Server/mysql-test/r/percona_long_query_time.result 2012-04-18 23:25:38 +0000
3315+++ Percona-Server/mysql-test/r/percona_long_query_time.result 1970-01-01 00:00:00 +0000
3316@@ -1,33 +0,0 @@
3317-SET long_query_time=2;
3318-[log_start.inc] percona.slow_extended.long_query_time
3319-SET SESSION query_exec_time=1.1;
3320-SELECT 1;
3321-1
3322-1
3323-SET SESSION query_exec_time=3.1;
3324-SELECT 1;
3325-1
3326-1
3327-SET SESSION query_exec_time=5.1;
3328-SELECT 1;
3329-1
3330-1
3331-SET long_query_time=4;
3332-SET SESSION query_exec_time=1.1;
3333-SELECT 1;
3334-1
3335-1
3336-SET SESSION query_exec_time=3.1;
3337-SELECT 1;
3338-1
3339-1
3340-SET SESSION query_exec_time=5.1;
3341-SELECT 1;
3342-1
3343-1
3344-SET SESSION query_exec_time=default;
3345-SET long_query_time=2;
3346-[log_stop.inc] percona.slow_extended.long_query_time
3347-SET long_query_time=default;
3348-[log_grep.inc] file: percona.slow_extended.long_query_time pattern: Query_time
3349-[log_grep.inc] lines: 3
3350
3351=== modified file 'Percona-Server/mysql-test/r/percona_min_examined_row_limit.result'
3352--- Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 2012-04-18 23:25:38 +0000
3353+++ Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 2013-04-23 05:48:36 +0000
3354@@ -11,7 +11,7 @@
3355 1
3356 1
3357 SET GLOBAL min_examined_row_limit=5;
3358-select * from t as t1, t as t2;
3359+SELECT * FROM t AS t1, t AS t2;
3360 id id
3361 1 1
3362 2 1
3363
3364=== modified file 'Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result'
3365--- Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result 2012-11-20 09:03:13 +0000
3366+++ Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result 2013-04-23 05:48:36 +0000
3367@@ -439,3 +439,86 @@
3368
3369 ######################################
3370 DROP TABLE t1, t2;
3371+CREATE TABLE t1 (id INT PRIMARY KEY, c INT, KEY(c)) ENGINE=InnoDB;
3372+INSERT INTO t1 VALUES (1, 1234);
3373+######################################
3374+
3375+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
3376+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
3377+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
3378+/*!40101 SET NAMES utf8 */;
3379+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
3380+/*!40103 SET TIME_ZONE='+00:00' */;
3381+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
3382+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
3383+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
3384+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
3385+DROP TABLE IF EXISTS `t1`;
3386+/*!40101 SET @saved_cs_client = @@character_set_client */;
3387+/*!40101 SET character_set_client = utf8 */;
3388+CREATE TABLE `t1` (
3389+ `id` int(11) NOT NULL,
3390+ `c` int(11) DEFAULT NULL,
3391+ PRIMARY KEY (`id`)
3392+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
3393+/*!40101 SET character_set_client = @saved_cs_client */;
3394+ALTER TABLE `t1` ADD KEY `c` (`c`);
3395+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
3396+
3397+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
3398+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
3399+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
3400+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
3401+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
3402+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
3403+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
3404+
3405+######################################
3406+DROP TABLE t1;
3407+CREATE TABLE `t1` (
3408+`id` int(11) NOT NULL AUTO_INCREMENT,
3409+`a` int(11) NOT NULL,
3410+PRIMARY KEY (`id`),
3411+KEY `a` (`a`),
3412+CONSTRAINT `a` FOREIGN KEY (`a`) REFERENCES `t1` (`id`)
3413+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
3414+######################################
3415+
3416+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
3417+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
3418+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
3419+/*!40101 SET NAMES utf8 */;
3420+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
3421+/*!40103 SET TIME_ZONE='+00:00' */;
3422+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
3423+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
3424+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
3425+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
3426+DROP TABLE IF EXISTS `t1`;
3427+/*!40101 SET @saved_cs_client = @@character_set_client */;
3428+/*!40101 SET character_set_client = utf8 */;
3429+CREATE TABLE `t1` (
3430+ `id` int(11) NOT NULL AUTO_INCREMENT,
3431+ `a` int(11) NOT NULL,
3432+ PRIMARY KEY (`id`),
3433+ KEY `a` (`a`),
3434+ CONSTRAINT `a` FOREIGN KEY (`a`) REFERENCES `t1` (`id`)
3435+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
3436+/*!40101 SET character_set_client = @saved_cs_client */;
3437+
3438+LOCK TABLES `t1` WRITE;
3439+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
3440+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
3441+UNLOCK TABLES;
3442+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
3443+
3444+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
3445+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
3446+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
3447+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
3448+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
3449+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
3450+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
3451+
3452+######################################
3453+DROP TABLE t1;
3454
3455=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
3456--- Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-01-03 23:45:16 +0000
3457+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-04-23 05:48:36 +0000
3458@@ -45,6 +45,8 @@
3459 EXPAND_FAST_INDEX_CREATION
3460 EXPIRE_LOGS_DAYS
3461 EXTERNAL_USER
3462+EXTRA_MAX_CONNECTIONS
3463+EXTRA_PORT
3464 FAST_INDEX_CREATION
3465 FLUSH
3466 FLUSH_TIME
3467@@ -93,7 +95,6 @@
3468 INNODB_BUFFER_POOL_SHM_CHECKSUM
3469 INNODB_BUFFER_POOL_SHM_KEY
3470 INNODB_BUFFER_POOL_SIZE
3471-INNODB_CHANGED_PAGES_LIMIT
3472 INNODB_CHANGE_BUFFERING
3473 INNODB_CHANGE_BUFFERING_DEBUG
3474 INNODB_CHECKPOINT_AGE_TARGET
3475@@ -126,6 +127,7 @@
3476 INNODB_KILL_IDLE_TRANSACTION
3477 INNODB_LARGE_PREFIX
3478 INNODB_LAZY_DROP_TABLE
3479+INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG
3480 INNODB_LOCKING_FAKE_CHANGES
3481 INNODB_LOCKS_UNSAFE_FOR_BINLOG
3482 INNODB_LOCK_WAIT_TIMEOUT
3483@@ -135,6 +137,7 @@
3484 INNODB_LOG_FILE_SIZE
3485 INNODB_LOG_GROUP_HOME_DIR
3486 INNODB_MAX_BITMAP_FILE_SIZE
3487+INNODB_MAX_CHANGED_PAGES
3488 INNODB_MAX_DIRTY_PAGES_PCT
3489 INNODB_MAX_PURGE_LAG
3490 INNODB_MERGE_SORT_BLOCK_SIZE
3491@@ -144,6 +147,7 @@
3492 INNODB_OPEN_FILES
3493 INNODB_PAGE_SIZE
3494 INNODB_PERSISTENT_STATS_ROOT_PAGE
3495+INNODB_PRINT_ALL_DEADLOCKS
3496 INNODB_PURGE_BATCH_SIZE
3497 INNODB_PURGE_THREADS
3498 INNODB_RANDOM_READ_AHEAD
3499@@ -171,6 +175,7 @@
3500 INNODB_THREAD_CONCURRENCY_TIMER_BASED
3501 INNODB_THREAD_SLEEP_DELAY
3502 INNODB_TRACK_CHANGED_PAGES
3503+INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
3504 INNODB_TRX_RSEG_N_SLOTS_DEBUG
3505 INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
3506 INNODB_USE_NATIVE_AIO
3507@@ -288,6 +293,7 @@
3508 PROFILING_HISTORY_SIZE
3509 PROTOCOL_VERSION
3510 PROXY_USER
3511+PSEUDO_SLAVE_MODE
3512 PSEUDO_THREAD_ID
3513 QUERY_ALLOC_BLOCK_SIZE
3514 QUERY_CACHE_LIMIT
3515@@ -374,6 +380,12 @@
3516 THREAD_CACHE_SIZE
3517 THREAD_CONCURRENCY
3518 THREAD_HANDLING
3519+THREAD_POOL_HIGH_PRIO_TICKETS
3520+THREAD_POOL_IDLE_TIMEOUT
3521+THREAD_POOL_MAX_THREADS
3522+THREAD_POOL_OVERSUBSCRIBE
3523+THREAD_POOL_SIZE
3524+THREAD_POOL_STALL_LIMIT
3525 THREAD_STACK
3526 THREAD_STATISTICS
3527 TIMED_MUTEXES
3528
3529=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_release.result'
3530--- Percona-Server/mysql-test/r/percona_server_variables_release.result 2012-11-25 09:30:58 +0000
3531+++ Percona-Server/mysql-test/r/percona_server_variables_release.result 2013-04-23 05:48:36 +0000
3532@@ -43,6 +43,8 @@
3533 EXPAND_FAST_INDEX_CREATION
3534 EXPIRE_LOGS_DAYS
3535 EXTERNAL_USER
3536+EXTRA_MAX_CONNECTIONS
3537+EXTRA_PORT
3538 FAST_INDEX_CREATION
3539 FLUSH
3540 FLUSH_TIME
3541@@ -91,7 +93,6 @@
3542 INNODB_BUFFER_POOL_SHM_CHECKSUM
3543 INNODB_BUFFER_POOL_SHM_KEY
3544 INNODB_BUFFER_POOL_SIZE
3545-INNODB_CHANGED_PAGES_LIMIT
3546 INNODB_CHANGE_BUFFERING
3547 INNODB_CHECKPOINT_AGE_TARGET
3548 INNODB_CHECKSUMS
3549@@ -132,6 +133,7 @@
3550 INNODB_LOG_FILE_SIZE
3551 INNODB_LOG_GROUP_HOME_DIR
3552 INNODB_MAX_BITMAP_FILE_SIZE
3553+INNODB_MAX_CHANGED_PAGES
3554 INNODB_MAX_DIRTY_PAGES_PCT
3555 INNODB_MAX_PURGE_LAG
3556 INNODB_MERGE_SORT_BLOCK_SIZE
3557@@ -140,6 +142,7 @@
3558 INNODB_OLD_BLOCKS_TIME
3559 INNODB_OPEN_FILES
3560 INNODB_PAGE_SIZE
3561+INNODB_PRINT_ALL_DEADLOCKS
3562 INNODB_PURGE_BATCH_SIZE
3563 INNODB_PURGE_THREADS
3564 INNODB_RANDOM_READ_AHEAD
3565@@ -283,6 +286,7 @@
3566 PROFILING_HISTORY_SIZE
3567 PROTOCOL_VERSION
3568 PROXY_USER
3569+PSEUDO_SLAVE_MODE
3570 PSEUDO_THREAD_ID
3571 QUERY_ALLOC_BLOCK_SIZE
3572 QUERY_CACHE_LIMIT
3573@@ -367,6 +371,12 @@
3574 THREAD_CACHE_SIZE
3575 THREAD_CONCURRENCY
3576 THREAD_HANDLING
3577+THREAD_POOL_HIGH_PRIO_TICKETS
3578+THREAD_POOL_IDLE_TIMEOUT
3579+THREAD_POOL_MAX_THREADS
3580+THREAD_POOL_OVERSUBSCRIBE
3581+THREAD_POOL_SIZE
3582+THREAD_POOL_STALL_LIMIT
3583 THREAD_STACK
3584 THREAD_STATISTICS
3585 TIMED_MUTEXES
3586
3587=== modified file 'Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result'
3588--- Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result 2012-10-27 05:16:07 +0000
3589+++ Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result 2013-04-23 05:48:36 +0000
3590@@ -1,172 +1,27 @@
3591 DROP TABLE IF EXISTS t;
3592-CREATE TABLE t(a INT) engine=InnoDB;
3593-INSERT INTO t VALUES(0),(1),(2),(3),(4);
3594-[log_start.inc] percona.slow_extended.error_on_quit
3595-SET log_slow_verbosity=innodb;
3596-SET long_query_time= 0;
3597-CREATE TABLE t(a INT) engine=InnoDB;
3598-# Disconnecting (passing to Slow Query Log "# administrative command: Quit")
3599-[log_stop.inc] percona.slow_extended.error_on_quit
3600-################################################################################
3601-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: CREATE
3602-[log_grep.inc] lines: 1
3603-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: INSERT
3604-[log_grep.inc] lines: 0
3605-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: SELECT
3606-[log_grep.inc] lines: 0
3607-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Quit
3608-[log_grep.inc] lines: 1
3609-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: [^0]+
3610-[log_grep.inc] lines: 1
3611-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 0
3612-[log_grep.inc] lines: 2
3613-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: [^0]+
3614-[log_grep.inc] lines: 0
3615-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: 0
3616-[log_grep.inc] lines: 3
3617-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: [^0]+
3618-[log_grep.inc] lines: 0
3619-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: 0
3620-[log_grep.inc] lines: 3
3621-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: [^0]+
3622-[log_grep.inc] lines: 0
3623-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
3624-[log_grep.inc] lines: 3
3625-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
3626-[log_grep.inc] lines: 0
3627-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
3628-[log_grep.inc] lines: 3
3629-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
3630-[log_grep.inc] lines: 2
3631-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
3632-[log_grep.inc] lines: 1
3633-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: [^0]+
3634-[log_grep.inc] lines: 0
3635-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: 0
3636-[log_grep.inc] lines: 3
3637-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: [^0]+
3638-[log_grep.inc] lines: 0
3639-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: 0
3640-[log_grep.inc] lines: 3
3641-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: [^0]+
3642-[log_grep.inc] lines: 0
3643-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: 0
3644-[log_grep.inc] lines: 3
3645-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # No InnoDB statistics available for this query
3646-[log_grep.inc] lines: 2
3647-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # InnoDB_trx_id:
3648-[log_grep.inc] lines: 1
3649-################################################################################
3650-[log_start.inc] percona.slow_extended.error_on_quit
3651-SET log_slow_verbosity=innodb;
3652-SET long_query_time= 0;
3653-INSERT INTO t SELECT * FROM t ORDER BY RAND();
3654-# Disconnecting (passing to Slow Query Log "# administrative command: Quit")
3655-[log_stop.inc] percona.slow_extended.error_on_quit
3656-################################################################################
3657-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: CREATE
3658-[log_grep.inc] lines: 0
3659-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: INSERT
3660-[log_grep.inc] lines: 1
3661-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: SELECT
3662-[log_grep.inc] lines: 1
3663-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Quit
3664-[log_grep.inc] lines: 1
3665-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: [^0]+
3666-[log_grep.inc] lines: 0
3667-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 0
3668-[log_grep.inc] lines: 3
3669-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: [^0]+
3670-[log_grep.inc] lines: 0
3671-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: 0
3672-[log_grep.inc] lines: 3
3673-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: [^0]+
3674-[log_grep.inc] lines: 1
3675-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: 0
3676-[log_grep.inc] lines: 2
3677-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: [^0]+
3678-[log_grep.inc] lines: 2
3679-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
3680-[log_grep.inc] lines: 1
3681-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
3682-[log_grep.inc] lines: 1
3683-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
3684-[log_grep.inc] lines: 2
3685-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
3686-[log_grep.inc] lines: 2
3687-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
3688-[log_grep.inc] lines: 1
3689-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: [^0]+
3690-[log_grep.inc] lines: 1
3691-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: 0
3692-[log_grep.inc] lines: 2
3693-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: [^0]+
3694-[log_grep.inc] lines: 0
3695-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: 0
3696-[log_grep.inc] lines: 3
3697-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: [^0]+
3698-[log_grep.inc] lines: 1
3699-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: 0
3700-[log_grep.inc] lines: 2
3701-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # No InnoDB statistics available for this query
3702-[log_grep.inc] lines: 2
3703-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # InnoDB_trx_id:
3704-[log_grep.inc] lines: 1
3705-################################################################################
3706-[log_start.inc] percona.slow_extended.error_on_quit
3707-SET log_slow_verbosity=innodb;
3708-SET long_query_time= 0;
3709+SET GLOBAL log_slow_admin_statements=ON;
3710+SET GLOBAL long_query_time=0;
3711+SET GLOBAL min_examined_row_limit=0;
3712+CREATE TABLE t(a INT) engine=InnoDB;
3713+[log_start.inc] percona.slow_extended.error_on_quit_1
3714+CREATE TABLE t(a INT) engine=InnoDB;
3715+ERROR 42S01: Table 't' already exists
3716+[log_stop.inc] percona.slow_extended.error_on_quit_1
3717+[log_grep.inc] file: percona.slow_extended.error_on_quit_1 pattern: Last_errno: [1-9]\d*\s
3718+[log_grep.inc] lines: 1
3719+[log_start.inc] percona.slow_extended.error_on_quit_2
3720+# Disconnecting (passing to Slow Query Log "# administrative command: Quit")
3721+[log_stop.inc] percona.slow_extended.error_on_quit_2
3722+[log_grep.inc] file: percona.slow_extended.error_on_quit_2 pattern: Last_errno: 0\s
3723+[log_grep.inc] lines: 2
3724+[log_start.inc] percona.slow_extended.error_on_quit_3
3725 SELECT * FROM t;
3726+a
3727 # Disconnecting (passing to Slow Query Log "# administrative command: Quit")
3728-[log_stop.inc] percona.slow_extended.error_on_quit
3729-################################################################################
3730-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: CREATE
3731-[log_grep.inc] lines: 0
3732-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: INSERT
3733-[log_grep.inc] lines: 0
3734-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: SELECT
3735-[log_grep.inc] lines: 1
3736-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Quit
3737-[log_grep.inc] lines: 1
3738-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: [^0]+
3739-[log_grep.inc] lines: 0
3740-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 0
3741-[log_grep.inc] lines: 3
3742-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: [^0]+
3743-[log_grep.inc] lines: 1
3744-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: 0
3745-[log_grep.inc] lines: 2
3746-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: [^0]+
3747-[log_grep.inc] lines: 1
3748-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: 0
3749-[log_grep.inc] lines: 2
3750-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: [^0]+
3751-[log_grep.inc] lines: 0
3752-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
3753-[log_grep.inc] lines: 3
3754-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
3755-[log_grep.inc] lines: 1
3756-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
3757-[log_grep.inc] lines: 2
3758-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
3759-[log_grep.inc] lines: 2
3760-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
3761-[log_grep.inc] lines: 1
3762-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: [^0]+
3763-[log_grep.inc] lines: 0
3764-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: 0
3765-[log_grep.inc] lines: 3
3766-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: [^0]+
3767-[log_grep.inc] lines: 0
3768-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: 0
3769-[log_grep.inc] lines: 3
3770-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: [^0]+
3771-[log_grep.inc] lines: 0
3772-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: 0
3773-[log_grep.inc] lines: 3
3774-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # No InnoDB statistics available for this query
3775-[log_grep.inc] lines: 2
3776-[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # InnoDB_trx_id:
3777-[log_grep.inc] lines: 1
3778-################################################################################
3779+[log_stop.inc] percona.slow_extended.error_on_quit_3
3780+[log_grep.inc] file: percona.slow_extended.error_on_quit_3 pattern: Last_errno: 0\s
3781+[log_grep.inc] lines: 3
3782 DROP TABLE t;
3783+SET GLOBAL log_slow_admin_statements=default;
3784+SET GLOBAL long_query_time=default;
3785+SET GLOBAL min_examined_row_limit=default;
3786
3787=== added file 'Percona-Server/mysql-test/r/percona_slow_extended_log_error.result'
3788--- Percona-Server/mysql-test/r/percona_slow_extended_log_error.result 1970-01-01 00:00:00 +0000
3789+++ Percona-Server/mysql-test/r/percona_slow_extended_log_error.result 2013-04-23 05:48:36 +0000
3790@@ -0,0 +1,17 @@
3791+DROP TABLE IF EXISTS t1;
3792+SET SESSION min_examined_row_limit=0;
3793+SET long_query_time=0;
3794+[log_start.inc] percona.slow_extended.log_error_1
3795+CREATE TABLE t1(a INT);
3796+[log_stop.inc] percona.slow_extended.log_error_1
3797+[log_grep.inc] file: percona.slow_extended.log_error_1 pattern: ^.*Last_errno: 0 .*$
3798+[log_grep.inc] lines: 2
3799+[log_start.inc] percona.slow_extended.log_error_2
3800+CREATE TABLE t1(a INT);
3801+ERROR 42S01: Table 't1' already exists
3802+[log_stop.inc] percona.slow_extended.log_error_2
3803+[log_grep.inc] file: percona.slow_extended.log_error_2 pattern: ^.*Last_errno: 1050 .*$
3804+[log_grep.inc] lines: 1
3805+DROP TABLE t1;
3806+SET long_query_time=default;
3807+SET SESSION min_examined_row_limit=default;
3808
3809=== removed file 'Percona-Server/mysql-test/r/percona_slow_extended_log_error.result'
3810--- Percona-Server/mysql-test/r/percona_slow_extended_log_error.result 2012-04-18 23:25:38 +0000
3811+++ Percona-Server/mysql-test/r/percona_slow_extended_log_error.result 1970-01-01 00:00:00 +0000
3812@@ -1,10 +0,0 @@
3813-SET long_query_time=0;
3814-DROP TABLE IF EXISTS t1;
3815-CREATE TABLE t(a INT);
3816-[log_start.inc] percona.slow_extended.log_error
3817-CREATE TABLE t(a INT);
3818-ERROR 42S01: Table 't' already exists
3819-[log_stop.inc] percona.slow_extended.log_error
3820-[log_grep.inc] file: percona.slow_extended.log_error pattern: Last_errno: 1050
3821-[log_grep.inc] lines: 1
3822-DROP TABLE t;
3823
3824=== modified file 'Percona-Server/mysql-test/r/percona_slow_query_log_rate.result'
3825--- Percona-Server/mysql-test/r/percona_slow_query_log_rate.result 2012-04-18 23:25:38 +0000
3826+++ Percona-Server/mysql-test/r/percona_slow_query_log_rate.result 2013-04-23 05:48:36 +0000
3827@@ -1,78 +1,54 @@
3828-SET GLOBAL long_query_time=1;
3829+SET GLOBAL long_query_time=0;
3830 SET GLOBAL log_slow_rate_type='session';
3831 SET GLOBAL log_slow_rate_limit=3;
3832-[log_start.inc] percona.slow_extended.log_slow_rate_limit
3833-SET SESSION query_exec_time=1.1;
3834-SET SESSION query_exec_id=1;
3835-SELECT 'connection_one';
3836-connection_one
3837-connection_one
3838-SET SESSION query_exec_time=1.1;
3839-SET SESSION query_exec_id=2;
3840-SELECT 'connection_two';
3841-connection_two
3842-connection_two
3843-SET SESSION query_exec_time=1.1;
3844-SET SESSION query_exec_id=3;
3845-SELECT 'connection_three';
3846-connection_three
3847-connection_three
3848-SET SESSION query_exec_time=1.1;
3849-SET SESSION query_exec_id=4;
3850-SELECT 'connection_one';
3851-connection_one
3852-connection_one
3853-SET SESSION query_exec_time=1.1;
3854-SET SESSION query_exec_id=5;
3855-SELECT 'connection_two';
3856-connection_two
3857-connection_two
3858-SET SESSION query_exec_time=1.1;
3859-SET SESSION query_exec_id=6;
3860-SELECT 'connection_three';
3861-connection_three
3862-connection_three
3863-[log_stop.inc] percona.slow_extended.log_slow_rate_limit
3864-[log_grep.inc] file: percona.slow_extended.log_slow_rate_limit pattern:
3865+[log_start.inc] percona.slow_extended.log_slow_rate_limit_1
3866+SELECT 'connection_one';
3867+connection_one
3868+connection_one
3869+SELECT 'connection_two';
3870+connection_two
3871+connection_two
3872+SELECT 'connection_three';
3873+connection_three
3874+connection_three
3875+SELECT 'connection_one';
3876+connection_one
3877+connection_one
3878+SELECT 'connection_two';
3879+connection_two
3880+connection_two
3881+SELECT 'connection_three';
3882+connection_three
3883+connection_three
3884+[log_stop.inc] percona.slow_extended.log_slow_rate_limit_1
3885+[log_grep.inc] file: percona.slow_extended.log_slow_rate_limit_1 pattern:
3886 [log_grep.inc] sum: 2
3887 [log_grep.inc] zero: 2
3888 SET GLOBAL log_slow_rate_type='query';
3889 SET GLOBAL log_slow_rate_limit=2;
3890-[log_start.inc] percona.slow_extended.log_slow_rate_limit
3891-SET SESSION query_exec_time=1.1;
3892-SET SESSION query_exec_id=1;
3893-SELECT 'connection_one';
3894-connection_one
3895-connection_one
3896-SET SESSION query_exec_time=1.1;
3897-SET SESSION query_exec_id=2;
3898-SELECT 'connection_two';
3899-connection_two
3900-connection_two
3901-SET SESSION query_exec_time=1.1;
3902-SET SESSION query_exec_id=3;
3903-SELECT 'connection_three';
3904-connection_three
3905-connection_three
3906-SET SESSION query_exec_time=1.1;
3907-SET SESSION query_exec_id=4;
3908-SELECT 'connection_one';
3909-connection_one
3910-connection_one
3911-SET SESSION query_exec_time=1.1;
3912-SET SESSION query_exec_id=5;
3913-SELECT 'connection_two';
3914-connection_two
3915-connection_two
3916-SET SESSION query_exec_time=1.1;
3917-SET SESSION query_exec_id=6;
3918-SELECT 'connection_three';
3919-connection_three
3920-connection_three
3921-[log_stop.inc] percona.slow_extended.log_slow_rate_limit
3922-[log_grep.inc] file: percona.slow_extended.log_slow_rate_limit pattern:
3923-[log_grep.inc] sum: 3
3924-[log_grep.inc] zero: 0
3925+[log_start.inc] percona.slow_extended.log_slow_rate_limit_2
3926+SELECT 'connection_one';
3927+connection_one
3928+connection_one
3929+SELECT 'connection_two';
3930+connection_two
3931+connection_two
3932+SELECT 'connection_three';
3933+connection_three
3934+connection_three
3935+SELECT 'connection_one';
3936+connection_one
3937+connection_one
3938+SELECT 'connection_two';
3939+connection_two
3940+connection_two
3941+SELECT 'connection_three';
3942+connection_three
3943+connection_three
3944+[log_stop.inc] percona.slow_extended.log_slow_rate_limit_2
3945+[log_grep.inc] file: percona.slow_extended.log_slow_rate_limit_2 pattern:
3946+[log_grep.inc] sum: 0
3947+[log_grep.inc] zero: 3
3948 SET GLOBAL long_query_time=default;
3949 SET GLOBAL log_slow_rate_type=default;
3950 SET GLOBAL log_slow_rate_limit=default;
3951
3952=== added file 'Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result'
3953--- Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result 1970-01-01 00:00:00 +0000
3954+++ Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result 2013-04-23 05:48:36 +0000
3955@@ -0,0 +1,16 @@
3956+SET SESSION min_examined_row_limit=0;
3957+SET SESSION long_query_time=0;
3958+SET GLOBAL slow_query_log_timestamp_always=TRUE;
3959+[log_start.inc] percona_slow_extended_query_log_1
3960+SELECT 1;
3961+1
3962+1
3963+SELECT 2;
3964+2
3965+2
3966+[log_stop.inc] percona_slow_extended_query_log_1
3967+[log_grep.inc] file: percona_slow_extended_query_log_1 pattern: ^# Time: \d{6} (\d| )\d:\d\d:\d\d$
3968+[log_grep.inc] lines: 3
3969+SET GLOBAL slow_query_log_timestamp_always=default;
3970+SET SESSION long_query_time=default;
3971+SET SESSION min_examined_row_limit=default;
3972
3973=== removed file 'Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result'
3974--- Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result 2012-04-18 23:25:38 +0000
3975+++ Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_always.result 1970-01-01 00:00:00 +0000
3976@@ -1,41 +0,0 @@
3977-SET long_query_time=2;
3978-SET GLOBAL slow_query_log_timestamp_always=ON;
3979-[log_start.inc] percona.slow_extended.slow_query_log_timestamp_always
3980-SET SESSION query_exec_time=2.1;
3981-SELECT 1;
3982-1
3983-1
3984-SELECT 1;
3985-1
3986-1
3987-SELECT 1;
3988-1
3989-1
3990-SET GLOBAL slow_query_log_timestamp_always=OFF;
3991-SET SESSION query_exec_time=2.1;
3992-SELECT 1;
3993-1
3994-1
3995-SELECT 1;
3996-1
3997-1
3998-SELECT 1;
3999-1
4000-1
4001-SET GLOBAL slow_query_log_timestamp_always=ON;
4002-SET SESSION query_exec_time=2.1;
4003-SELECT 1;
4004-1
4005-1
4006-SELECT 1;
4007-1
4008-1
4009-SELECT 1;
4010-1
4011-1
4012-SET SESSION query_exec_time=default;
4013-[log_stop.inc] percona.slow_extended.slow_query_log_timestamp_always
4014-SET GLOBAL slow_query_log_timestamp_always=default;
4015-SET long_query_time=default;
4016-[log_grep.inc] file: percona.slow_extended.slow_query_log_timestamp_always pattern: # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
4017-[log_grep.inc] lines: 6
4018
4019=== added file 'Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result'
4020--- Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result 1970-01-01 00:00:00 +0000
4021+++ Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result 2013-04-23 05:48:36 +0000
4022@@ -0,0 +1,24 @@
4023+SET @old_slow_query_log_timestamp_always=@@slow_query_log_timestamp_always;
4024+SET SESSION min_examined_row_limit=0;
4025+SET long_query_time=0;
4026+SET GLOBAL slow_query_log_timestamp_always=TRUE;
4027+SET GLOBAL slow_query_log_timestamp_precision='microsecond';
4028+[log_start.inc] percona_slow_extended_1
4029+SELECT 1;
4030+1
4031+1
4032+[log_stop.inc] percona_slow_extended_1
4033+[log_grep.inc] file: percona_slow_extended_1 pattern: ^# Time: \d{6} (\d| )\d:\d\d:\d\d\.\d{6}$
4034+[log_grep.inc] lines: 2
4035+SET GLOBAL slow_query_log_timestamp_precision='second';
4036+[log_start.inc] percona_slow_extended_2
4037+SELECT 1;
4038+1
4039+1
4040+[log_stop.inc] percona_slow_extended_2
4041+[log_grep.inc] file: percona_slow_extended_2 pattern: ^# Time: \d{6} (\d| )\d:\d\d:\d\d$
4042+[log_grep.inc] lines: 2
4043+SET long_query_time=default;
4044+SET SESSION min_examined_row_limit=default;
4045+SET GLOBAL slow_query_log_timestamp_always=@old_slow_query_log_timestamp_always;
4046+SET GLOBAL slow_query_log_timestamp_precision=default;
4047
4048=== removed file 'Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result'
4049--- Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result 2012-04-18 23:25:38 +0000
4050+++ Percona-Server/mysql-test/r/percona_slow_query_log_timestamp_precision.result 1970-01-01 00:00:00 +0000
4051@@ -1,18 +0,0 @@
4052-SET long_query_time=2;
4053-[log_start.inc] percona.slow_extended.slow_query_log_timestamp_precision
4054-SET SESSION query_exec_time=2.1;
4055-SELECT 1;
4056-1
4057-1
4058-SET GLOBAL slow_query_log_timestamp_precision='microsecond';
4059-SELECT 1;
4060-1
4061-1
4062-SET SESSION query_exec_time=default;
4063-[log_stop.inc] percona.slow_extended.slow_query_log_timestamp_precision
4064-SET GLOBAL slow_query_log_timestamp_precision=default;
4065-SET long_query_time=default;
4066-[log_grep.inc] file: percona.slow_extended.slow_query_log_timestamp_precision pattern: # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
4067-[log_grep.inc] lines: 1
4068-[log_grep.inc] file: percona.slow_extended.slow_query_log_timestamp_precision pattern: # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
4069-[log_grep.inc] lines: 2
4070
4071=== added file 'Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result'
4072--- Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result 1970-01-01 00:00:00 +0000
4073+++ Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result 2013-04-23 05:48:36 +0000
4074@@ -0,0 +1,20 @@
4075+SET SESSION min_examined_row_limit=0;
4076+SET GLOBAL long_query_time=1;
4077+[log_start.inc] percona.slow_extended.slow_query_log_use_global_control
4078+SET SESSION query_exec_time=1.1;
4079+SELECT 1;
4080+1
4081+1
4082+SET GLOBAL log_slow_verbosity=innodb;
4083+SET GLOBAL slow_query_log_use_global_control="log_slow_verbosity,long_query_time";
4084+SELECT 1;
4085+1
4086+1
4087+SET SESSION query_exec_time=default;
4088+[log_stop.inc] percona.slow_extended.slow_query_log_use_global_control
4089+SET GLOBAL slow_query_log_use_global_control='';
4090+SET GLOBAL log_slow_verbosity='';
4091+SET GLOBAL long_query_time=default;
4092+SET SESSION min_examined_row_limit=default;
4093+[log_grep.inc] file: percona.slow_extended.slow_query_log_use_global_control pattern: No InnoDB statistics available for this query
4094+[log_grep.inc] lines: 1
4095
4096=== removed file 'Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result'
4097--- Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result 2012-04-18 23:25:38 +0000
4098+++ Percona-Server/mysql-test/r/percona_slow_query_log_use_global_control.result 1970-01-01 00:00:00 +0000
4099@@ -1,18 +0,0 @@
4100-SET GLOBAL long_query_time=1;
4101-[log_start.inc] percona.slow_extended.slow_query_log_use_global_control
4102-SET SESSION query_exec_time=1.1;
4103-SELECT 1;
4104-1
4105-1
4106-SET GLOBAL log_slow_verbosity=innodb;
4107-SET GLOBAL slow_query_log_use_global_control="log_slow_verbosity,long_query_time";
4108-SELECT 1;
4109-1
4110-1
4111-SET SESSION query_exec_time=default;
4112-[log_stop.inc] percona.slow_extended.slow_query_log_use_global_control
4113-SET GLOBAL slow_query_log_use_global_control=default;
4114-SET GLOBAL log_slow_verbosity=default;
4115-SET GLOBAL long_query_time=default;
4116-[log_grep.inc] file: percona.slow_extended.slow_query_log_use_global_control pattern: No InnoDB statistics available for this query
4117-[log_grep.inc] lines: 1
4118
4119=== added file 'Percona-Server/mysql-test/r/pool_of_threads.result'
4120--- Percona-Server/mysql-test/r/pool_of_threads.result 1970-01-01 00:00:00 +0000
4121+++ Percona-Server/mysql-test/r/pool_of_threads.result 2013-04-23 05:48:36 +0000
4122@@ -0,0 +1,2169 @@
4123+drop table if exists t1,t2,t3,t4;
4124+CREATE TABLE t1 (
4125+Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
4126+Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL
4127+);
4128+INSERT INTO t1 VALUES (9410,9412);
4129+select period from t1;
4130+period
4131+9410
4132+select * from t1;
4133+Period Varor_period
4134+9410 9412
4135+select t1.* from t1;
4136+Period Varor_period
4137+9410 9412
4138+CREATE TABLE t2 (
4139+auto int not null auto_increment,
4140+fld1 int(6) unsigned zerofill DEFAULT '000000' NOT NULL,
4141+companynr tinyint(2) unsigned zerofill DEFAULT '00' NOT NULL,
4142+fld3 char(30) DEFAULT '' NOT NULL,
4143+fld4 char(35) DEFAULT '' NOT NULL,
4144+fld5 char(35) DEFAULT '' NOT NULL,
4145+fld6 char(4) DEFAULT '' NOT NULL,
4146+UNIQUE fld1 (fld1),
4147+KEY fld3 (fld3),
4148+PRIMARY KEY (auto)
4149+);
4150+select t2.fld3 from t2 where companynr = 58 and fld3 like "%imaginable%";
4151+fld3
4152+imaginable
4153+select fld3 from t2 where fld3 like "%cultivation" ;
4154+fld3
4155+cultivation
4156+select t2.fld3,companynr from t2 where companynr = 57+1 order by fld3;
4157+fld3 companynr
4158+concoct 58
4159+druggists 58
4160+engrossing 58
4161+Eurydice 58
4162+exclaimers 58
4163+ferociousness 58
4164+hopelessness 58
4165+Huey 58
4166+imaginable 58
4167+judges 58
4168+merging 58
4169+ostrich 58
4170+peering 58
4171+Phelps 58
4172+presumes 58
4173+Ruth 58
4174+sentences 58
4175+Shylock 58
4176+straggled 58
4177+synergy 58
4178+thanking 58
4179+tying 58
4180+unlocks 58
4181+select fld3,companynr from t2 where companynr = 58 order by fld3;
4182+fld3 companynr
4183+concoct 58
4184+druggists 58
4185+engrossing 58
4186+Eurydice 58
4187+exclaimers 58
4188+ferociousness 58
4189+hopelessness 58
4190+Huey 58
4191+imaginable 58
4192+judges 58
4193+merging 58
4194+ostrich 58
4195+peering 58
4196+Phelps 58
4197+presumes 58
4198+Ruth 58
4199+sentences 58
4200+Shylock 58
4201+straggled 58
4202+synergy 58
4203+thanking 58
4204+tying 58
4205+unlocks 58
4206+select fld3 from t2 order by fld3 desc limit 10;
4207+fld3
4208+youthfulness
4209+yelped
4210+Wotan
4211+workers
4212+Witt
4213+witchcraft
4214+Winsett
4215+Willy
4216+willed
4217+wildcats
4218+select fld3 from t2 order by fld3 desc limit 5;
4219+fld3
4220+youthfulness
4221+yelped
4222+Wotan
4223+workers
4224+Witt
4225+select fld3 from t2 order by fld3 desc limit 5,5;
4226+fld3
4227+witchcraft
4228+Winsett
4229+Willy
4230+willed
4231+wildcats
4232+select t2.fld3 from t2 where fld3 = 'honeysuckle';
4233+fld3
4234+honeysuckle
4235+select t2.fld3 from t2 where fld3 LIKE 'honeysuckl_';
4236+fld3
4237+honeysuckle
4238+select t2.fld3 from t2 where fld3 LIKE 'hon_ysuckl_';
4239+fld3
4240+honeysuckle
4241+select t2.fld3 from t2 where fld3 LIKE 'honeysuckle%';
4242+fld3
4243+honeysuckle
4244+select t2.fld3 from t2 where fld3 LIKE 'h%le';
4245+fld3
4246+honeysuckle
4247+select t2.fld3 from t2 where fld3 LIKE 'honeysuckle_';
4248+fld3
4249+select t2.fld3 from t2 where fld3 LIKE 'don_t_find_me_please%';
4250+fld3
4251+explain select t2.fld3 from t2 where fld3 = 'honeysuckle';
4252+id select_type table type possible_keys key key_len ref rows Extra
4253+1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index
4254+explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle';
4255+id select_type table type possible_keys key key_len ref rows Extra
4256+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
4257+explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle';
4258+id select_type table type possible_keys key key_len ref rows Extra
4259+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
4260+explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle';
4261+id select_type table type possible_keys key key_len ref rows Extra
4262+1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index
4263+explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle';
4264+id select_type table type possible_keys key key_len ref rows Extra
4265+1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index
4266+explain select fld3 from t2 ignore index (fld3,not_used);
4267+ERROR 42000: Key 'not_used' doesn't exist in table 't2'
4268+explain select fld3 from t2 use index (not_used);
4269+ERROR 42000: Key 'not_used' doesn't exist in table 't2'
4270+select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3;
4271+fld3
4272+honeysuckle
4273+honoring
4274+explain select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3;
4275+id select_type table type possible_keys key key_len ref rows Extra
4276+1 SIMPLE t2 range fld3 fld3 30 NULL 2 Using where; Using index
4277+select fld1,fld3 from t2 where fld3="Colombo" or fld3 = "nondecreasing" order by fld3;
4278+fld1 fld3
4279+148504 Colombo
4280+068305 Colombo
4281+000000 nondecreasing
4282+select fld1,fld3 from t2 where companynr = 37 and fld3 = 'appendixes';
4283+fld1 fld3
4284+232605 appendixes
4285+1232605 appendixes
4286+1232606 appendixes
4287+1232607 appendixes
4288+1232608 appendixes
4289+1232609 appendixes
4290+select fld1 from t2 where fld1=250501 or fld1="250502";
4291+fld1
4292+250501
4293+250502
4294+explain select fld1 from t2 where fld1=250501 or fld1="250502";
4295+id select_type table type possible_keys key key_len ref rows Extra
4296+1 SIMPLE t2 range fld1 fld1 4 NULL 2 Using where; Using index
4297+select fld1 from t2 where fld1=250501 or fld1=250502 or fld1 >= 250505 and fld1 <= 250601 or fld1 between 250501 and 250502;
4298+fld1
4299+250501
4300+250502
4301+250505
4302+250601
4303+explain select fld1 from t2 where fld1=250501 or fld1=250502 or fld1 >= 250505 and fld1 <= 250601 or fld1 between 250501 and 250502;
4304+id select_type table type possible_keys key key_len ref rows Extra
4305+1 SIMPLE t2 range fld1 fld1 4 NULL 4 Using where; Using index
4306+select fld1,fld3 from t2 where companynr = 37 and fld3 like 'f%';
4307+fld1 fld3
4308+218401 faithful
4309+018007 fanatic
4310+228311 fated
4311+018017 featherweight
4312+218022 feed
4313+088303 feminine
4314+058004 Fenton
4315+038017 fetched
4316+018054 fetters
4317+208101 fiftieth
4318+238007 filial
4319+013606 fingerings
4320+218008 finishers
4321+038205 firearm
4322+188505 fitting
4323+202301 Fitzpatrick
4324+238008 fixedly
4325+012001 flanking
4326+018103 flint
4327+018104 flopping
4328+188007 flurried
4329+013602 foldout
4330+226205 foothill
4331+232102 forgivably
4332+228306 forthcoming
4333+186002 freakish
4334+208113 freest
4335+231315 freezes
4336+036002 funereal
4337+226209 furnishings
4338+198006 furthermore
4339+select fld3 from t2 where fld3 like "L%" and fld3 = "ok";
4340+fld3
4341+select fld3 from t2 where (fld3 like "C%" and fld3 = "Chantilly");
4342+fld3
4343+Chantilly
4344+select fld1,fld3 from t2 where fld1 like "25050%";
4345+fld1 fld3
4346+250501 poisoning
4347+250502 Iraqis
4348+250503 heaving
4349+250504 population
4350+250505 bomb
4351+select fld1,fld3 from t2 where fld1 like "25050_";
4352+fld1 fld3
4353+250501 poisoning
4354+250502 Iraqis
4355+250503 heaving
4356+250504 population
4357+250505 bomb
4358+select distinct companynr from t2;
4359+companynr
4360+00
4361+37
4362+36
4363+50
4364+58
4365+29
4366+40
4367+53
4368+65
4369+41
4370+34
4371+68
4372+select distinct companynr from t2 order by companynr;
4373+companynr
4374+00
4375+29
4376+34
4377+36
4378+37
4379+40
4380+41
4381+50
4382+53
4383+58
4384+65
4385+68
4386+select distinct companynr from t2 order by companynr desc;
4387+companynr
4388+68
4389+65
4390+58
4391+53
4392+50
4393+41
4394+40
4395+37
4396+36
4397+34
4398+29
4399+00
4400+select distinct t2.fld3,period from t2,t1 where companynr=37 and fld3 like "O%";
4401+fld3 period
4402+obliterates 9410
4403+offload 9410
4404+opaquely 9410
4405+organizer 9410
4406+overestimating 9410
4407+overlay 9410
4408+select distinct fld3 from t2 where companynr = 34 order by fld3;
4409+fld3
4410+absentee
4411+accessed
4412+ahead
4413+alphabetic
4414+Asiaticizations
4415+attitude
4416+aye
4417+bankruptcies
4418+belays
4419+Blythe
4420+bomb
4421+boulevard
4422+bulldozes
4423+cannot
4424+caressing
4425+charcoal
4426+checksumming
4427+chess
4428+clubroom
4429+colorful
4430+cosy
4431+creator
4432+crying
4433+Darius
4434+diffusing
4435+duality
4436+Eiffel
4437+Epiphany
4438+Ernestine
4439+explorers
4440+exterminated
4441+famine
4442+forked
4443+Gershwins
4444+heaving
4445+Hodges
4446+Iraqis
4447+Italianization
4448+Lagos
4449+landslide
4450+libretto
4451+Majorca
4452+mastering
4453+narrowed
4454+occurred
4455+offerers
4456+Palestine
4457+Peruvianizes
4458+pharmaceutic
4459+poisoning
4460+population
4461+Pygmalion
4462+rats
4463+realest
4464+recording
4465+regimented
4466+retransmitting
4467+reviver
4468+rouses
4469+scars
4470+sicker
4471+sleepwalk
4472+stopped
4473+sugars
4474+translatable
4475+uncles
4476+unexpected
4477+uprisings
4478+versatility
4479+vest
4480+select distinct fld3 from t2 limit 10;
4481+fld3
4482+abates
4483+abiding
4484+Abraham
4485+abrogating
4486+absentee
4487+abut
4488+accessed
4489+accruing
4490+accumulating
4491+accuracies
4492+select distinct fld3 from t2 having fld3 like "A%" limit 10;
4493+fld3
4494+abates
4495+abiding
4496+Abraham
4497+abrogating
4498+absentee
4499+abut
4500+accessed
4501+accruing
4502+accumulating
4503+accuracies
4504+select distinct substring(fld3,1,3) from t2 where fld3 like "A%";
4505+substring(fld3,1,3)
4506+aba
4507+abi
4508+Abr
4509+abs
4510+abu
4511+acc
4512+acq
4513+acu
4514+Ade
4515+adj
4516+Adl
4517+adm
4518+Ado
4519+ads
4520+adv
4521+aer
4522+aff
4523+afi
4524+afl
4525+afo
4526+agi
4527+ahe
4528+aim
4529+air
4530+Ald
4531+alg
4532+ali
4533+all
4534+alp
4535+alr
4536+ama
4537+ame
4538+amm
4539+ana
4540+and
4541+ane
4542+Ang
4543+ani
4544+Ann
4545+Ant
4546+api
4547+app
4548+aqu
4549+Ara
4550+arc
4551+Arm
4552+arr
4553+Art
4554+Asi
4555+ask
4556+asp
4557+ass
4558+ast
4559+att
4560+aud
4561+Aug
4562+aut
4563+ave
4564+avo
4565+awe
4566+aye
4567+Azt
4568+select distinct substring(fld3,1,3) as a from t2 having a like "A%" order by a limit 10;
4569+a
4570+aba
4571+abi
4572+Abr
4573+abs
4574+abu
4575+acc
4576+acq
4577+acu
4578+Ade
4579+adj
4580+select distinct substring(fld3,1,3) from t2 where fld3 like "A%" limit 10;
4581+substring(fld3,1,3)
4582+aba
4583+abi
4584+Abr
4585+abs
4586+abu
4587+acc
4588+acq
4589+acu
4590+Ade
4591+adj
4592+select distinct substring(fld3,1,3) as a from t2 having a like "A%" limit 10;
4593+a
4594+aba
4595+abi
4596+Abr
4597+abs
4598+abu
4599+acc
4600+acq
4601+acu
4602+Ade
4603+adj
4604+create table t3 (
4605+period int not null,
4606+name char(32) not null,
4607+companynr int not null,
4608+price double(11,0),
4609+price2 double(11,0),
4610+key (period),
4611+key (name)
4612+);
4613+create temporary table tmp engine = myisam select * from t3;
4614+insert into t3 select * from tmp;
4615+insert into tmp select * from t3;
4616+insert into t3 select * from tmp;
4617+insert into tmp select * from t3;
4618+insert into t3 select * from tmp;
4619+insert into tmp select * from t3;
4620+insert into t3 select * from tmp;
4621+insert into tmp select * from t3;
4622+insert into t3 select * from tmp;
4623+insert into tmp select * from t3;
4624+insert into t3 select * from tmp;
4625+insert into tmp select * from t3;
4626+insert into t3 select * from tmp;
4627+insert into tmp select * from t3;
4628+insert into t3 select * from tmp;
4629+insert into tmp select * from t3;
4630+insert into t3 select * from tmp;
4631+alter table t3 add t2nr int not null auto_increment primary key first;
4632+drop table tmp;
4633+SET SQL_BIG_TABLES=1;
4634+select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
4635+namn
4636+Abraham Abraham
4637+abrogating abrogating
4638+admonishing admonishing
4639+Adolph Adolph
4640+afield afield
4641+aging aging
4642+ammonium ammonium
4643+analyzable analyzable
4644+animals animals
4645+animized animized
4646+SET SQL_BIG_TABLES=0;
4647+select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
4648+concat(fld3," ",fld3)
4649+Abraham Abraham
4650+abrogating abrogating
4651+admonishing admonishing
4652+Adolph Adolph
4653+afield afield
4654+aging aging
4655+ammonium ammonium
4656+analyzable analyzable
4657+animals animals
4658+animized animized
4659+select distinct fld5 from t2 limit 10;
4660+fld5
4661+neat
4662+Steinberg
4663+jarring
4664+tinily
4665+balled
4666+persist
4667+attainments
4668+fanatic
4669+measures
4670+rightfulness
4671+select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
4672+fld3 count(*)
4673+affixed 1
4674+and 1
4675+annoyers 1
4676+Anthony 1
4677+assayed 1
4678+assurers 1
4679+attendants 1
4680+bedlam 1
4681+bedpost 1
4682+boasted 1
4683+SET SQL_BIG_TABLES=1;
4684+select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
4685+fld3 count(*)
4686+affixed 1
4687+and 1
4688+annoyers 1
4689+Anthony 1
4690+assayed 1
4691+assurers 1
4692+attendants 1
4693+bedlam 1
4694+bedpost 1
4695+boasted 1
4696+SET SQL_BIG_TABLES=0;
4697+select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
4698+fld3 repeat("a",length(fld3)) count(*)
4699+circus aaaaaa 1
4700+cited aaaaa 1
4701+Colombo aaaaaaa 1
4702+congresswoman aaaaaaaaaaaaa 1
4703+contrition aaaaaaaaaa 1
4704+corny aaaaa 1
4705+cultivation aaaaaaaaaaa 1
4706+definiteness aaaaaaaaaaaa 1
4707+demultiplex aaaaaaaaaaa 1
4708+disappointing aaaaaaaaaaaaa 1
4709+select distinct companynr,rtrim(space(512+companynr)) from t3 order by 1,2;
4710+companynr rtrim(space(512+companynr))
4711+37
4712+78
4713+101
4714+154
4715+311
4716+447
4717+512
4718+select distinct fld3 from t2,t3 where t2.companynr = 34 and t2.fld1=t3.t2nr order by fld3;
4719+fld3
4720+explain select t3.t2nr,fld3 from t2,t3 where t2.companynr = 34 and t2.fld1=t3.t2nr order by t3.t2nr,fld3;
4721+id select_type table type possible_keys key key_len ref rows Extra
4722+1 SIMPLE t2 ALL fld1 NULL NULL NULL 1199 Using where; Using temporary; Using filesort
4723+1 SIMPLE t3 eq_ref PRIMARY PRIMARY 4 test.t2.fld1 1 Using where; Using index
4724+explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period;
4725+id select_type table type possible_keys key key_len ref rows Extra
4726+1 SIMPLE t1 ALL period NULL NULL NULL 41810 Using temporary; Using filesort
4727+1 SIMPLE t3 ref period period 4 test.t1.period 4181
4728+explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period limit 10;
4729+id select_type table type possible_keys key key_len ref rows Extra
4730+1 SIMPLE t3 index period period 4 NULL 1
4731+1 SIMPLE t1 ref period period 4 test.t3.period 4181
4732+explain select * from t3 as t1,t3 where t1.period=t3.period order by t1.period limit 10;
4733+id select_type table type possible_keys key key_len ref rows Extra
4734+1 SIMPLE t1 index period period 4 NULL 1
4735+1 SIMPLE t3 ref period period 4 test.t1.period 4181
4736+select period from t1;
4737+period
4738+9410
4739+select period from t1 where period=1900;
4740+period
4741+select fld3,period from t1,t2 where fld1 = 011401 order by period;
4742+fld3 period
4743+breaking 9410
4744+select fld3,period from t2,t3 where t2.fld1 = 011401 and t2.fld1=t3.t2nr and t3.period=1001;
4745+fld3 period
4746+breaking 1001
4747+explain select fld3,period from t2,t3 where t2.fld1 = 011401 and t3.t2nr=t2.fld1 and 1001 = t3.period;
4748+id select_type table type possible_keys key key_len ref rows Extra
4749+1 SIMPLE t2 const fld1 fld1 4 const 1
4750+1 SIMPLE t3 const PRIMARY,period PRIMARY 4 const 1
4751+select fld3,period from t2,t1 where companynr*10 = 37*10;
4752+fld3 period
4753+breaking 9410
4754+Romans 9410
4755+intercepted 9410
4756+bewilderingly 9410
4757+astound 9410
4758+admonishing 9410
4759+sumac 9410
4760+flanking 9410
4761+combed 9410
4762+subjective 9410
4763+scatterbrain 9410
4764+Eulerian 9410
4765+Kane 9410
4766+overlay 9410
4767+perturb 9410
4768+goblins 9410
4769+annihilates 9410
4770+Wotan 9410
4771+snatching 9410
4772+concludes 9410
4773+laterally 9410
4774+yelped 9410
4775+grazing 9410
4776+Baird 9410
4777+celery 9410
4778+misunderstander 9410
4779+handgun 9410
4780+foldout 9410
4781+mystic 9410
4782+succumbed 9410
4783+Nabisco 9410
4784+fingerings 9410
4785+aging 9410
4786+afield 9410
4787+ammonium 9410
4788+boat 9410
4789+intelligibility 9410
4790+Augustine 9410
4791+teethe 9410
4792+dreaded 9410
4793+scholastics 9410
4794+audiology 9410
4795+wallet 9410
4796+parters 9410
4797+eschew 9410
4798+quitter 9410
4799+neat 9410
4800+Steinberg 9410
4801+jarring 9410
4802+tinily 9410
4803+balled 9410
4804+persist 9410
4805+attainments 9410
4806+fanatic 9410
4807+measures 9410
4808+rightfulness 9410
4809+capably 9410
4810+impulsive 9410
4811+starlet 9410
4812+terminators 9410
4813+untying 9410
4814+announces 9410
4815+featherweight 9410
4816+pessimist 9410
4817+daughter 9410
4818+decliner 9410
4819+lawgiver 9410
4820+stated 9410
4821+readable 9410
4822+attrition 9410
4823+cascade 9410
4824+motors 9410
4825+interrogate 9410
4826+pests 9410
4827+stairway 9410
4828+dopers 9410
4829+testicle 9410
4830+Parsifal 9410
4831+leavings 9410
4832+postulation 9410
4833+squeaking 9410
4834+contrasted 9410
4835+leftover 9410
4836+whiteners 9410
4837+erases 9410
4838+Punjab 9410
4839+Merritt 9410
4840+Quixotism 9410
4841+sweetish 9410
4842+dogging 9410
4843+scornfully 9410
4844+bellow 9410
4845+bills 9410
4846+cupboard 9410
4847+sureties 9410
4848+puddings 9410
4849+fetters 9410
4850+bivalves 9410
4851+incurring 9410
4852+Adolph 9410
4853+pithed 9410
4854+Miles 9410
4855+trimmings 9410
4856+tragedies 9410
4857+skulking 9410
4858+flint 9410
4859+flopping 9410
4860+relaxing 9410
4861+offload 9410
4862+suites 9410
4863+lists 9410
4864+animized 9410
4865+multilayer 9410
4866+standardizes 9410
4867+Judas 9410
4868+vacuuming 9410
4869+dentally 9410
4870+humanness 9410
4871+inch 9410
4872+Weissmuller 9410
4873+irresponsibly 9410
4874+luckily 9410
4875+culled 9410
4876+medical 9410
4877+bloodbath 9410
4878+subschema 9410
4879+animals 9410
4880+Micronesia 9410
4881+repetitions 9410
4882+Antares 9410
4883+ventilate 9410
4884+pityingly 9410
4885+interdependent 9410
4886+Graves 9410
4887+neonatal 9410
4888+chafe 9410
4889+honoring 9410
4890+realtor 9410
4891+elite 9410
4892+funereal 9410
4893+abrogating 9410
4894+sorters 9410
4895+Conley 9410
4896+lectured 9410
4897+Abraham 9410
4898+Hawaii 9410
4899+cage 9410
4900+hushes 9410
4901+Simla 9410
4902+reporters 9410
4903+Dutchman 9410
4904+descendants 9410
4905+groupings 9410
4906+dissociate 9410
4907+coexist 9410
4908+Beebe 9410
4909+Taoism 9410
4910+Connally 9410
4911+fetched 9410
4912+checkpoints 9410
4913+rusting 9410
4914+galling 9410
4915+obliterates 9410
4916+traitor 9410
4917+resumes 9410
4918+analyzable 9410
4919+terminator 9410
4920+gritty 9410
4921+firearm 9410
4922+minima 9410
4923+Selfridge 9410
4924+disable 9410
4925+witchcraft 9410
4926+betroth 9410
4927+Manhattanize 9410
4928+imprint 9410
4929+peeked 9410
4930+swelling 9410
4931+interrelationships 9410
4932+riser 9410
4933+Gandhian 9410
4934+peacock 9410
4935+bee 9410
4936+kanji 9410
4937+dental 9410
4938+scarf 9410
4939+chasm 9410
4940+insolence 9410
4941+syndicate 9410
4942+alike 9410
4943+imperial 9410
4944+convulsion 9410
4945+railway 9410
4946+validate 9410
4947+normalizes 9410
4948+comprehensive 9410
4949+chewing 9410
4950+denizen 9410
4951+schemer 9410
4952+chronicle 9410
4953+Kline 9410
4954+Anatole 9410
4955+partridges 9410
4956+brunch 9410
4957+recruited 9410
4958+dimensions 9410
4959+Chicana 9410
4960+announced 9410
4961+praised 9410
4962+employing 9410
4963+linear 9410
4964+quagmire 9410
4965+western 9410
4966+relishing 9410
4967+serving 9410
4968+scheduling 9410
4969+lore 9410
4970+eventful 9410
4971+arteriole 9410
4972+disentangle 9410
4973+cured 9410
4974+Fenton 9410
4975+avoidable 9410
4976+drains 9410
4977+detectably 9410
4978+husky 9410
4979+impelling 9410
4980+undoes 9410
4981+evened 9410
4982+squeezes 9410
4983+destroyer 9410
4984+rudeness 9410
4985+beaner 9410
4986+boorish 9410
4987+Everhart 9410
4988+encompass 9410
4989+mushrooms 9410
4990+Alison 9410
4991+externally 9410
4992+pellagra 9410
4993+cult 9410
4994+creek 9410
4995+Huffman 9410
4996+Majorca 9410
4997+governing 9410
4998+gadfly 9410
4999+reassigned 9410
5000+intentness 9410
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: