Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/tree-fixes-5.5 into lp:percona-server/5.5

  1. tree-fixes-5.5
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 522
Proposed branch: lp:~laurynas-biveinis/percona-server/tree-fixes-5.5
Merge into: lp:percona-server/5.5
Diff against target: 59404 lines (+46/-28565) (has conflicts)
235 files modified
COPYING.show_temp_51 (+0/-13)
Percona-Server/include/flashcache_ioctl.h (+0/-53)
Percona-Server/mysql-test/include/have_response_time_distribution.inc (+0/-4)
Percona-Server/mysql-test/include/log_grep.inc (+0/-41)
Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc (+0/-95)
Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc (+0/-12)
Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc (+0/-5)
Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc (+0/-3)
Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc (+0/-7)
Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc (+0/-8)
Percona-Server/mysql-test/include/percona_server_variables.inc (+0/-3)
Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc (+0/-56)
Percona-Server/mysql-test/include/query_response_time-replication.inc (+0/-58)
Percona-Server/mysql-test/include/query_response_time-stored.inc (+0/-37)
Percona-Server/mysql-test/include/query_response_time.inc (+0/-43)
Percona-Server/mysql-test/lib/Subunit.pm (+0/-94)
Percona-Server/mysql-test/r/have_response_time_distribution.require (+0/-2)
Percona-Server/mysql-test/r/percona_bug45702.result (+0/-21)
Percona-Server/mysql-test/r/percona_bug933969.result (+0/-16)
Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result (+0/-4)
Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result (+0/-28)
Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result (+0/-4)
Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result (+0/-64)
Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result (+0/-3)
Percona-Server/mysql-test/r/percona_innodb_version.result (+0/-3)
Percona-Server/mysql-test/r/percona_log_connection_error.result (+0/-16)
Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result (+0/-6)
Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result (+0/-6)
Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result (+0/-7)
Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result (+0/-6)
Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result (+0/-6)
Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result (+0/-6)
Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result (+0/-6)
Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result (+0/-6)
Percona-Server/mysql-test/r/percona_min_examined_row_limit.result (+0/-35)
Percona-Server/mysql-test/r/percona_query_cache_with_comments.result (+0/-866)
Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result (+0/-21)
Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result (+0/-865)
Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result (+0/-396)
Percona-Server/mysql-test/r/percona_query_response_time-replication.result (+0/-727)
Percona-Server/mysql-test/r/percona_query_response_time-stored.result (+0/-544)
Percona-Server/mysql-test/r/percona_query_response_time.result (+0/-1307)
Percona-Server/mysql-test/r/percona_show_slave_status_nolock.result (+0/-69)
Percona-Server/mysql-test/r/percona_show_temp_tables.result (+0/-58)
Percona-Server/mysql-test/r/percona_sql_no_fcache.result (+0/-12)
Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result (+0/-20)
Percona-Server/mysql-test/r/percona_utf8_general50_ci.result (+0/-38)
Percona-Server/mysql-test/r/percona_xtradb_admin_command.result (+0/-6)
Percona-Server/mysql-test/r/percona_xtradb_bug317074.result (+0/-5)
Percona-Server/mysql-test/suite/rpl/r/percona_bug860910.result (+0/-17)
Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.cnf (+0/-8)
Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.test (+0/-38)
Percona-Server/mysql-test/t/percona_bug45702.test (+0/-34)
Percona-Server/mysql-test/t/percona_bug643149.test (+0/-49)
Percona-Server/mysql-test/t/percona_bug933969.test (+0/-42)
Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm.test (+0/-2)
Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test (+0/-61)
Percona-Server/mysql-test/t/percona_innodb_doublewrite_file-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_innodb_doublewrite_file.test (+0/-2)
Percona-Server/mysql-test/t/percona_innodb_expand_fast_index_creation.test (+0/-45)
Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table.test (+0/-2)
Percona-Server/mysql-test/t/percona_innodb_version.test (+0/-8)
Percona-Server/mysql-test/t/percona_log_connection_error-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_connection_error.test (+0/-54)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.cnf (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.test (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.test (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.test (+0/-3)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.test (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_filter-cl-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_filter-cl.test (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl.test (+0/-3)
Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl.test (+0/-2)
Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl-master.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test (+0/-2)
Percona-Server/mysql-test/t/percona_query_cache_with_comments.test (+0/-5)
Percona-Server/mysql-test/t/percona_query_cache_with_comments_crash.test (+0/-22)
Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable.test (+0/-3)
Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test (+0/-208)
Percona-Server/mysql-test/t/percona_query_response_time-replication.test (+0/-28)
Percona-Server/mysql-test/t/percona_query_response_time-stored.test (+0/-36)
Percona-Server/mysql-test/t/percona_query_response_time.test (+0/-20)
Percona-Server/mysql-test/t/percona_server_variables_debug.test (+0/-2)
Percona-Server/mysql-test/t/percona_server_variables_release.test (+0/-2)
Percona-Server/mysql-test/t/percona_show_slave_status_nolock.test (+0/-90)
Percona-Server/mysql-test/t/percona_show_temp_tables.test (+0/-65)
Percona-Server/mysql-test/t/percona_sql_no_fcache.test (+0/-11)
Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test (+0/-35)
Percona-Server/mysql-test/t/percona_ucs2_general50_ci.test (+0/-12)
Percona-Server/mysql-test/t/percona_utf8_general50_ci.test (+0/-9)
Percona-Server/mysql-test/t/percona_xtradb_admin_command.test (+0/-3)
Percona-Server/mysql-test/t/percona_xtradb_bug317074.test (+0/-47)
Percona-Server/patch_info/log_connection_error.patch (+0/-6)
Percona-Server/patch_info/log_warnings_suppress.patch (+0/-9)
Percona-Server/patch_info/microsec_process.info (+0/-8)
Percona-Server/patch_info/mysql_remove_eol_carret.patch (+0/-7)
Percona-Server/patch_info/query_cache_enhance.patch (+0/-15)
Percona-Server/patch_info/remove_fcntl_excessive_calls.info (+0/-6)
Percona-Server/patch_info/response-time-distribution.info (+0/-9)
Percona-Server/patch_info/show_slave_status_nolock.patch (+0/-6)
Percona-Server/patch_info/slow_extended.info (+0/-25)
Percona-Server/patch_info/sql_no_fcache.info (+0/-6)
Percona-Server/patch_info/userstats.patch (+0/-17)
Percona-Server/sql/query_response_time.cc (+0/-302)
Percona-Server/sql/query_response_time.h (+0/-64)
Percona-Server/sql/query_strip_comments.h (+0/-37)
UDF/Makefile.am (+0/-1)
UDF/configure.ac (+10/-0)
UDF/src/Makefile.am (+0/-7)
UDF/src/fnv1a_udf.cc (+0/-202)
UDF/src/fnv_udf.cc (+0/-207)
UDF/src/murmur_udf.cc (+0/-166)
build/debian/additions/debian-start (+0/-32)
build/debian/additions/debian-start.inc.sh (+0/-72)
build/debian/changelog (+0/-35)
build/debian/compat (+0/-1)
build/debian/copyright (+0/-86)
build/debian/patches/00list (+0/-5)
build/debian/patches/10_percona-server-prefix.dpatch (+0/-53)
build/debian/patches/20_scripts__mysql_create_system_tables__no_test.dpatch (+0/-32)
build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch (+0/-31)
build/debian/patches/40_scripts__mysql_install_db.sh__no_test.dpatch (+0/-23)
build/debian/patches/50_mysql-test__db_test.dpatch (+0/-24)
doc/make.bat (+0/-170)
doc/source/compatibility.rst (+0/-27)
doc/source/development.rst (+0/-266)
doc/source/diagnostics/innodb_deadlock_count.rst (+0/-57)
doc/source/diagnostics/innodb_stats.rst (+0/-234)
doc/source/diagnostics/misc_info_schema_tables.rst (+0/-185)
doc/source/diagnostics/mysql_syslog.rst (+0/-43)
doc/source/diagnostics/process_list.rst (+0/-72)
doc/source/diagnostics/response_time_distribution.rst (+0/-257)
doc/source/diagnostics/show_engines.rst (+0/-40)
doc/source/diagnostics/user_stats.rst (+0/-253)
doc/source/ext/psdom.py (+0/-387)
doc/source/faq.rst (+0/-20)
doc/source/feature_comparison.rst (+0/-164)
doc/source/flexibility/buff_read_ahead_area.rst (+0/-36)
doc/source/flexibility/innodb_fast_shutdown.rst (+0/-36)
doc/source/flexibility/log_warnings_suppress.rst (+0/-53)
doc/source/flexibility/mysql_remove_eol_carret.rst (+0/-31)
doc/source/glossary.rst (+0/-111)
doc/source/installation.rst (+0/-207)
doc/source/management/innodb_dict_size_limit.rst (+0/-95)
doc/source/management/innodb_expand_import.rst (+0/-160)
doc/source/management/innodb_expanded_fast_index_creation.rst (+0/-84)
doc/source/management/innodb_fake_changes.rst (+0/-80)
doc/source/management/innodb_lru_dump_restore.rst (+0/-179)
doc/source/management/innodb_recovery_patches.rst (+0/-72)
doc/source/percona_xtradb.rst (+0/-13)
doc/source/performance/innodb_fast_checksum.rst (+0/-32)
doc/source/performance/innodb_lazy_drop_table.rst (+36/-0)
doc/source/performance/innodb_opt_lru_count.rst (+0/-7)
doc/source/performance/remove_fcntl_excessive_calls.rst (+0/-35)
doc/source/reliability/crash_resistant_replication.rst (+0/-104)
doc/source/reliability/error_pad.rst (+0/-55)
doc/source/reliability/innodb_corrupt_table_action.rst (+0/-52)
doc/source/reliability/log_connection_error.rst (+0/-14)
doc/source/scalability/innodb_extra_rseg.rst (+0/-49)
doc/source/scalability/innodb_insert_buffer.rst (+0/-68)
doc/source/scalability/innodb_split_buf_pool_mutex.rst (+0/-77)
doc/source/trademark-policy.rst (+0/-23)
python-for-subunit2junitxml/BytesIO.py (+0/-136)
python-for-subunit2junitxml/iso8601/LICENSE (+0/-20)
python-for-subunit2junitxml/iso8601/README (+0/-26)
python-for-subunit2junitxml/iso8601/README.subunit (+0/-5)
python-for-subunit2junitxml/iso8601/setup.py (+0/-58)
python-for-subunit2junitxml/iso8601/test_iso8601.py (+0/-111)
python-for-subunit2junitxml/junitxml/__init__.py (+0/-221)
python-for-subunit2junitxml/junitxml/tests/__init__.py (+0/-16)
python-for-subunit2junitxml/junitxml/tests/test_junitxml.py (+0/-327)
python-for-subunit2junitxml/subunit/__init__.py (+0/-1250)
python-for-subunit2junitxml/subunit/chunked.py (+0/-185)
python-for-subunit2junitxml/subunit/details.py (+0/-119)
python-for-subunit2junitxml/subunit/iso8601.py (+0/-133)
python-for-subunit2junitxml/subunit/progress_model.py (+0/-106)
python-for-subunit2junitxml/subunit/run.py (+0/-73)
python-for-subunit2junitxml/subunit/test_results.py (+0/-492)
python-for-subunit2junitxml/subunit/tests/TestUtil.py (+0/-80)
python-for-subunit2junitxml/subunit/tests/__init__.py (+0/-41)
python-for-subunit2junitxml/subunit/tests/sample-script.py (+0/-21)
python-for-subunit2junitxml/subunit/tests/sample-two-script.py (+0/-7)
python-for-subunit2junitxml/subunit/tests/test_chunked.py (+0/-152)
python-for-subunit2junitxml/subunit/tests/test_details.py (+0/-112)
python-for-subunit2junitxml/subunit/tests/test_progress_model.py (+0/-118)
python-for-subunit2junitxml/subunit/tests/test_subunit_filter.py (+0/-208)
python-for-subunit2junitxml/subunit/tests/test_subunit_stats.py (+0/-84)
python-for-subunit2junitxml/subunit/tests/test_subunit_tags.py (+0/-69)
python-for-subunit2junitxml/subunit/tests/test_tap2subunit.py (+0/-445)
python-for-subunit2junitxml/subunit/tests/test_test_protocol.py (+0/-1299)
python-for-subunit2junitxml/subunit/tests/test_test_results.py (+0/-300)
python-for-subunit2junitxml/testtools/__init__.py (+0/-80)
python-for-subunit2junitxml/testtools/_spinner.py (+0/-316)
python-for-subunit2junitxml/testtools/compat.py (+0/-286)
python-for-subunit2junitxml/testtools/content.py (+0/-238)
python-for-subunit2junitxml/testtools/content_type.py (+0/-33)
python-for-subunit2junitxml/testtools/deferredruntest.py (+0/-335)
python-for-subunit2junitxml/testtools/distutilscmd.py (+0/-62)
python-for-subunit2junitxml/testtools/helpers.py (+0/-64)
python-for-subunit2junitxml/testtools/matchers.py (+0/-785)
python-for-subunit2junitxml/testtools/monkey.py (+0/-97)
python-for-subunit2junitxml/testtools/run.py (+0/-332)
python-for-subunit2junitxml/testtools/runtest.py (+0/-200)
python-for-subunit2junitxml/testtools/testcase.py (+0/-724)
python-for-subunit2junitxml/testtools/testresult/__init__.py (+0/-19)
python-for-subunit2junitxml/testtools/testresult/doubles.py (+0/-111)
python-for-subunit2junitxml/testtools/testresult/real.py (+0/-621)
python-for-subunit2junitxml/testtools/tests/__init__.py (+0/-44)
python-for-subunit2junitxml/testtools/tests/helpers.py (+0/-72)
python-for-subunit2junitxml/testtools/tests/test_compat.py (+0/-257)
python-for-subunit2junitxml/testtools/tests/test_content.py (+0/-223)
python-for-subunit2junitxml/testtools/tests/test_content_type.py (+0/-46)
python-for-subunit2junitxml/testtools/tests/test_deferredruntest.py (+0/-738)
python-for-subunit2junitxml/testtools/tests/test_distutilscmd.py (+0/-90)
python-for-subunit2junitxml/testtools/tests/test_fixturesupport.py (+0/-79)
python-for-subunit2junitxml/testtools/tests/test_helpers.py (+0/-106)
python-for-subunit2junitxml/testtools/tests/test_matchers.py (+0/-695)
python-for-subunit2junitxml/testtools/tests/test_monkey.py (+0/-167)
python-for-subunit2junitxml/testtools/tests/test_run.py (+0/-77)
python-for-subunit2junitxml/testtools/tests/test_runtest.py (+0/-300)
python-for-subunit2junitxml/testtools/tests/test_spinner.py (+0/-332)
python-for-subunit2junitxml/testtools/tests/test_testresult.py (+0/-1372)
python-for-subunit2junitxml/testtools/tests/test_testsuite.py (+0/-53)
python-for-subunit2junitxml/testtools/tests/test_testtools.py (+0/-1143)
python-for-subunit2junitxml/testtools/tests/test_with_with.py (+0/-42)
python-for-subunit2junitxml/testtools/testsuite.py (+0/-87)
python-for-subunit2junitxml/testtools/utils.py (+0/-13)
subunit2junitxml (+0/-65)
Conflict: can't delete UDF.moved because it is not empty.  Not deleting.
Conflict adding file UDF.  Moved existing file to UDF.moved.
Conflict because UDF.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/source/performance/innodb_lazy_drop_table.rst.  Moved existing file to doc/source/performance/innodb_lazy_drop_table.rst.moved.
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/tree-fixes-5.5
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Registry Administrators Pending
Review via email: mp+165777@code.launchpad.net

Description of the change

Manually merge bug 1160951 (Delete Percona-Server/patch-info
directory) from 5.1. The merge is manual because the file-ids
differed.

    Fix bug 1099764 (Different bzr file-ids for the same files in 5.1,
    5.5, and 5.6).

    Re-add the following files with file-ids from the 5.1 tree:

    COPYING.show_temp_51
    Percona-Server/include/flashcache_ioctl.h
    Percona-Server/mysql-test/include/have_response_time_distribution.inc
    Percona-Server/mysql-test/include/log_grep.inc
    Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc
    Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc
    Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc
    Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc
    Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc
    Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc
    Percona-Server/mysql-test/include/percona_server_variables.inc
    Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc
    Percona-Server/mysql-test/include/query_response_time-replication.inc
    Percona-Server/mysql-test/include/query_response_time-stored.inc
    Percona-Server/mysql-test/include/query_response_time.inc
    Percona-Server/mysql-test/lib/Subunit.pm
    Percona-Server/mysql-test/r/have_response_time_distribution.require
    Percona-Server/mysql-test/r/percona_bug45702.result
    Percona-Server/mysql-test/r/percona_bug933969.result
    Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result
    Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result
    Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result
    Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result
    Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result
    Percona-Server/mysql-test/r/percona_innodb_version.result
    Percona-Server/mysql-test/r/percona_log_connection_error.result
    Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result
    Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result
    Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result
    Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result
    Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result
    Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result
    Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result
    Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result
    Percona-Server/mysql-test/r/percona_min_examined_row_limit.result
    Percona-Server/mysql-test/r/percona_query_cache_with_comments.result
    Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result
    Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result
    Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result
    Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result
    Percona-Server/mysql-test/r/percona_query_response_time-replication.result
    Percona-Server/mysql-test/r/percona_query_response_time-stored.result
    Percona-Server/mysql-test/r/percona_query_response_time.result
    Percona-Server/mysql-test/r/percona_show_slave_status_nolock.result
    Percona-Server/mysql-test/r/percona_show_temp_tables.result
    Percona-Server/mysql-test/r/percona_sql_no_fcache.result
    Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result
    Percona-Server/mysql-test/r/percona_utf8_general50_ci.result
    Percona-Server/mysql-test/r/percona_xtradb_admin_command.result
    Percona-Server/mysql-test/r/percona_xtradb_bug317074.result
    Percona-Server/mysql-test/suite/rpl/r/percona_bug860910.result
    Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.cnf
    Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.test
    Percona-Server/mysql-test/t/percona_bug45702.test
    Percona-Server/mysql-test/t/percona_bug643149.test
    Percona-Server/mysql-test/t/percona_bug933969.test
    Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm-master.opt
    Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm.test
    Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test
    Percona-Server/mysql-test/t/percona_innodb_doublewrite_file-master.opt
    Percona-Server/mysql-test/t/percona_innodb_doublewrite_file.test
    Percona-Server/mysql-test/t/percona_innodb_expand_fast_index_creation.test
    Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table-master.opt
    Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table.test
    Percona-Server/mysql-test/t/percona_innodb_version.test
    Percona-Server/mysql-test/t/percona_log_connection_error-master.opt
    Percona-Server/mysql-test/t/percona_log_connection_error.test
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.cnf
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.test
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.test
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.test
    Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf
    Percona-Server/mysql-test/t/percona_log_slow_filter-cl-master.opt
    Percona-Server/mysql-test/t/percona_log_slow_filter-cl.test
    Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl-master.opt
    Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl.test
    Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl-master.opt
    Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl.test
    Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl-master.opt
    Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test
    Percona-Server/mysql-test/t/percona_query_cache_with_comments.test
    Percona-Server/mysql-test/t/percona_query_cache_with_comments_crash.test
    Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable.test
    Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test
    Percona-Server/mysql-test/t/percona_query_response_time-replication.test
    Percona-Server/mysql-test/t/percona_query_response_time-stored.test
    Percona-Server/mysql-test/t/percona_query_response_time.test
    Percona-Server/mysql-test/t/percona_server_variables_debug.test
    Percona-Server/mysql-test/t/percona_server_variables_release.test
    Percona-Server/mysql-test/t/percona_show_slave_status_nolock.test
    Percona-Server/mysql-test/t/percona_show_temp_tables.test
    Percona-Server/mysql-test/t/percona_sql_no_fcache.test
    Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test
    Percona-Server/mysql-test/t/percona_ucs2_general50_ci.test
    Percona-Server/mysql-test/t/percona_utf8_general50_ci.test
    Percona-Server/mysql-test/t/percona_xtradb_admin_command.test
    Percona-Server/mysql-test/t/percona_xtradb_bug317074.test
    Percona-Server/mysql-test/t/query_cache_disabled-master.opt
    Percona-Server/sql/query_response_time.cc
    Percona-Server/sql/query_response_time.h
    Percona-Server/sql/query_strip_comments.h
    UDF
    UDF/Makefile.am
    UDF/configure.ac
    UDF/src
    UDF/src/Makefile.am
    UDF/src/fnv1a_udf.cc
    UDF/src/fnv_udf.cc
    UDF/src/murmur_udf.cc
    build/debian/additions
    build/debian/additions/debian-start
    build/debian/additions/debian-start.inc.sh
    build/debian/changelog
    build/debian/compat
    build/debian/copyright
    build/debian/patches
    build/debian/patches/00list
    build/debian/patches/50_mysql-test__db_test.dpatch
    build/debian/po
    doc/make.bat
    doc/source/_static
    doc/source/_templates
    doc/source/compatibility.rst
    doc/source/development.rst
    doc/source/diagnostics/innodb_deadlock_count.rst
    doc/source/diagnostics/innodb_stats.rst
    doc/source/diagnostics/misc_info_schema_tables.rst
    doc/source/diagnostics/mysql_syslog.rst
    doc/source/diagnostics/process_list.rst
    doc/source/diagnostics/response_time_distribution.rst
    doc/source/diagnostics/show_engines.rst
    doc/source/diagnostics/user_stats.rst
    doc/source/ext
    doc/source/ext/psdom.py
    doc/source/faq.rst
    doc/source/feature_comparison.rst
    doc/source/flexibility/buff_read_ahead_area.rst
    doc/source/flexibility/innodb_fast_shutdown.rst
    doc/source/flexibility/log_warnings_suppress.rst
    doc/source/flexibility/mysql_remove_eol_carret.rst
    doc/source/glossary.rst
    doc/source/installation.rst
    doc/source/management/innodb_dict_size_limit.rst
    doc/source/management/innodb_expand_import.rst
    doc/source/management/innodb_expanded_fast_index_creation.rst
    doc/source/management/innodb_fake_changes.rst
    doc/source/management/innodb_lru_dump_restore.rst
    doc/source/management/innodb_recovery_patches.rst
    doc/source/percona-server-logo.jpg
    doc/source/percona-xtrabackup-logo.jpg
    doc/source/percona-xtradb.png
    doc/source/percona_favicon.ico
    doc/source/percona_xtradb.rst
    doc/source/performance/innodb_fast_checksum.rst
    doc/source/performance/innodb_lazy_drop_table.rst
    doc/source/performance/innodb_opt_lru_count.rst
    doc/source/performance/remove_fcntl_excessive_calls.rst
    doc/source/reliability/crash_resistant_replication.rst
    doc/source/reliability/error_pad.rst
    doc/source/reliability/innodb_corrupt_table_action.rst
    doc/source/reliability/log_connection_error.rst
    doc/source/scalability/innodb_extra_rseg.rst
    doc/source/scalability/innodb_insert_buffer.rst
    doc/source/scalability/innodb_split_buf_pool_mutex.rst
    doc/source/trademark-policy.rst
    python-for-subunit2junitxml
    python-for-subunit2junitxml/BytesIO.py
    python-for-subunit2junitxml/iso8601
    python-for-subunit2junitxml/iso8601/LICENSE
    python-for-subunit2junitxml/iso8601/README
    python-for-subunit2junitxml/iso8601/README.subunit
    python-for-subunit2junitxml/iso8601/setup.py
    python-for-subunit2junitxml/iso8601/test_iso8601.py
    python-for-subunit2junitxml/junitxml
    python-for-subunit2junitxml/junitxml/__init__.py
    python-for-subunit2junitxml/junitxml/tests
    python-for-subunit2junitxml/junitxml/tests/__init__.py
    python-for-subunit2junitxml/junitxml/tests/test_junitxml.py
    python-for-subunit2junitxml/subunit
    python-for-subunit2junitxml/subunit/__init__.py
    python-for-subunit2junitxml/subunit/chunked.py
    python-for-subunit2junitxml/subunit/details.py
    python-for-subunit2junitxml/subunit/iso8601.py
    python-for-subunit2junitxml/subunit/progress_model.py
    python-for-subunit2junitxml/subunit/run.py
    python-for-subunit2junitxml/subunit/test_results.py
    python-for-subunit2junitxml/subunit/tests
    python-for-subunit2junitxml/subunit/tests/TestUtil.py
    python-for-subunit2junitxml/subunit/tests/__init__.py
    python-for-subunit2junitxml/subunit/tests/sample-script.py
    python-for-subunit2junitxml/subunit/tests/sample-two-script.py
    python-for-subunit2junitxml/subunit/tests/test_chunked.py
    python-for-subunit2junitxml/subunit/tests/test_details.py
    python-for-subunit2junitxml/subunit/tests/test_progress_model.py
    python-for-subunit2junitxml/subunit/tests/test_subunit_filter.py
    python-for-subunit2junitxml/subunit/tests/test_subunit_stats.py
    python-for-subunit2junitxml/subunit/tests/test_subunit_tags.py
    python-for-subunit2junitxml/subunit/tests/test_tap2subunit.py
    python-for-subunit2junitxml/subunit/tests/test_test_protocol.py
    python-for-subunit2junitxml/subunit/tests/test_test_results.py
    python-for-subunit2junitxml/testtools
    python-for-subunit2junitxml/testtools/__init__.py
    python-for-subunit2junitxml/testtools/_spinner.py
    python-for-subunit2junitxml/testtools/compat.py
    python-for-subunit2junitxml/testtools/content.py
    python-for-subunit2junitxml/testtools/content_type.py
    python-for-subunit2junitxml/testtools/deferredruntest.py
    python-for-subunit2junitxml/testtools/distutilscmd.py
    python-for-subunit2junitxml/testtools/helpers.py
    python-for-subunit2junitxml/testtools/matchers.py
    python-for-subunit2junitxml/testtools/monkey.py
    python-for-subunit2junitxml/testtools/run.py
    python-for-subunit2junitxml/testtools/runtest.py
    python-for-subunit2junitxml/testtools/testcase.py
    python-for-subunit2junitxml/testtools/testresult
    python-for-subunit2junitxml/testtools/testresult/__init__.py
    python-for-subunit2junitxml/testtools/testresult/doubles.py
    python-for-subunit2junitxml/testtools/testresult/real.py
    python-for-subunit2junitxml/testtools/tests
    python-for-subunit2junitxml/testtools/tests/__init__.py
    python-for-subunit2junitxml/testtools/tests/helpers.py
    python-for-subunit2junitxml/testtools/tests/test_compat.py
    python-for-subunit2junitxml/testtools/tests/test_content.py
    python-for-subunit2junitxml/testtools/tests/test_content_type.py
    python-for-subunit2junitxml/testtools/tests/test_deferredruntest.py
    python-for-subunit2junitxml/testtools/tests/test_distutilscmd.py
    python-for-subunit2junitxml/testtools/tests/test_fixturesupport.py
    python-for-subunit2junitxml/testtools/tests/test_helpers.py
    python-for-subunit2junitxml/testtools/tests/test_matchers.py
    python-for-subunit2junitxml/testtools/tests/test_monkey.py
    python-for-subunit2junitxml/testtools/tests/test_run.py
    python-for-subunit2junitxml/testtools/tests/test_runtest.py
    python-for-subunit2junitxml/testtools/tests/test_spinner.py
    python-for-subunit2junitxml/testtools/tests/test_testresult.py
    python-for-subunit2junitxml/testtools/tests/test_testsuite.py
    python-for-subunit2junitxml/testtools/tests/test_testtools.py
    python-for-subunit2junitxml/testtools/tests/test_with_with.py
    python-for-subunit2junitxml/testtools/testsuite.py
    python-for-subunit2junitxml/testtools/utils.py

    Did not adjust file-ids that are incorrect for the upstream files.

    Did not adjust file-ids for
    Percona-Server/mysql-test/t/query_cache_disabled-master.opt
    Percona-Server/mysql-test/t/query_cache_disabled.test
    Percona-Server/mysql-test/r/query_cache_disabled.result
    due to upstream introducing these files in 5.5, thus we have own in
    5.1 and take theirs in 5.5.

    Did not handle files that have versions in their names,
    e.g. slow_extended.rst vs slow_extended_55.rst.

    Did not adjust file-ids for man/*, as these are imported from source
    tarballs, thus have no relation between the branches.

    Did not adjust file-ids for
    doc/source/release-notes/release-notes_index.rst
    because it's version-specific.

Tested by comparing that the commit does not cause any differences in a non-bzr diff.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Conflicts are GCA vs trunk. Will be trivially resolved at the merge time.

Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'COPYING.show_temp_51'
2--- COPYING.show_temp_51 1970-01-01 00:00:00 +0000
3+++ COPYING.show_temp_51 2013-05-26 07:24:39 +0000
4@@ -0,0 +1,13 @@
5+Portions of this software contain modifications contributed by Venu Anuganti.
6+These contributions are used with the following license:
7+
8+Copyright (c) 2010, Venu Anuganti, http://venublog.com/
9+All rights reserved.
10+
11+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
12+
13+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
14+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
15+ * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
16+
17+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
18
19=== removed file 'COPYING.show_temp_51'
20--- COPYING.show_temp_51 2010-12-09 18:30:58 +0000
21+++ COPYING.show_temp_51 1970-01-01 00:00:00 +0000
22@@ -1,13 +0,0 @@
23-Portions of this software contain modifications contributed by Venu Anuganti.
24-These contributions are used with the following license:
25-
26-Copyright (c) 2010, Venu Anuganti, http://venublog.com/
27-All rights reserved.
28-
29-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
30-
31- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
32- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
33- * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
34-
35-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36
37=== added file 'Percona-Server/include/flashcache_ioctl.h'
38--- Percona-Server/include/flashcache_ioctl.h 1970-01-01 00:00:00 +0000
39+++ Percona-Server/include/flashcache_ioctl.h 2013-05-26 07:24:39 +0000
40@@ -0,0 +1,53 @@
41+/****************************************************************************
42+ * flashcache_ioctl.h
43+ * FlashCache: Device mapper target for block-level disk caching
44+ *
45+ * Copyright 2010 Facebook, Inc.
46+ * Author: Mohan Srinivasan (mohan@facebook.com)
47+ *
48+ * Based on DM-Cache:
49+ * Copyright (C) International Business Machines Corp., 2006
50+ * Author: Ming Zhao (mingzhao@ufl.edu)
51+ *
52+ * This program is free software; you can redistribute it and/or modify
53+ * it under the terms of the GNU General Public License as published by
54+ * the Free Software Foundation; under version 2 of the License.
55+ *
56+ * This program is distributed in the hope that it will be useful,
57+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
58+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
59+ * GNU General Public License for more details.
60+ *
61+ * You should have received a copy of the GNU General Public License
62+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
63+ ****************************************************************************/
64+
65+#ifndef FLASHCACHE_IOCTL_H
66+#define FLASHCACHE_IOCTL_H
67+
68+#include <linux/types.h>
69+
70+#define FLASHCACHE_IOCTL 0xfe
71+
72+enum {
73+ FLASHCACHEADDNCPID_CMD=200,
74+ FLASHCACHEDELNCPID_CMD,
75+ FLASHCACHEDELNCALL_CMD,
76+ FLASHCACHEADDWHITELIST_CMD,
77+ FLASHCACHEDELWHITELIST_CMD,
78+ FLASHCACHEDELWHITELISTALL_CMD,
79+};
80+
81+#define FLASHCACHEADDNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDNCPID_CMD, pid_t)
82+#define FLASHCACHEDELNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCPID_CMD, pid_t)
83+#define FLASHCACHEDELNCALL _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCALL_CMD, pid_t)
84+
85+#define FLASHCACHEADDBLACKLIST FLASHCACHEADDNCPID
86+#define FLASHCACHEDELBLACKLIST FLASHCACHEDELNCPID
87+#define FLASHCACHEDELALLBLACKLIST FLASHCACHEDELNCALL
88+
89+#define FLASHCACHEADDWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDWHITELIST_CMD, pid_t)
90+#define FLASHCACHEDELWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELIST_CMD, pid_t)
91+#define FLASHCACHEDELALLWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELISTALL_CMD, pid_t)
92+
93+#endif
94
95=== removed file 'Percona-Server/include/flashcache_ioctl.h'
96--- Percona-Server/include/flashcache_ioctl.h 2012-04-18 23:25:54 +0000
97+++ Percona-Server/include/flashcache_ioctl.h 1970-01-01 00:00:00 +0000
98@@ -1,53 +0,0 @@
99-/****************************************************************************
100- * flashcache_ioctl.h
101- * FlashCache: Device mapper target for block-level disk caching
102- *
103- * Copyright 2010 Facebook, Inc.
104- * Author: Mohan Srinivasan (mohan@facebook.com)
105- *
106- * Based on DM-Cache:
107- * Copyright (C) International Business Machines Corp., 2006
108- * Author: Ming Zhao (mingzhao@ufl.edu)
109- *
110- * This program is free software; you can redistribute it and/or modify
111- * it under the terms of the GNU General Public License as published by
112- * the Free Software Foundation; under version 2 of the License.
113- *
114- * This program is distributed in the hope that it will be useful,
115- * but WITHOUT ANY WARRANTY; without even the implied warranty of
116- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117- * GNU General Public License for more details.
118- *
119- * You should have received a copy of the GNU General Public License
120- * along with this program. If not, see <http://www.gnu.org/licenses/>.
121- ****************************************************************************/
122-
123-#ifndef FLASHCACHE_IOCTL_H
124-#define FLASHCACHE_IOCTL_H
125-
126-#include <linux/types.h>
127-
128-#define FLASHCACHE_IOCTL 0xfe
129-
130-enum {
131- FLASHCACHEADDNCPID_CMD=200,
132- FLASHCACHEDELNCPID_CMD,
133- FLASHCACHEDELNCALL_CMD,
134- FLASHCACHEADDWHITELIST_CMD,
135- FLASHCACHEDELWHITELIST_CMD,
136- FLASHCACHEDELWHITELISTALL_CMD,
137-};
138-
139-#define FLASHCACHEADDNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDNCPID_CMD, pid_t)
140-#define FLASHCACHEDELNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCPID_CMD, pid_t)
141-#define FLASHCACHEDELNCALL _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCALL_CMD, pid_t)
142-
143-#define FLASHCACHEADDBLACKLIST FLASHCACHEADDNCPID
144-#define FLASHCACHEDELBLACKLIST FLASHCACHEDELNCPID
145-#define FLASHCACHEDELALLBLACKLIST FLASHCACHEDELNCALL
146-
147-#define FLASHCACHEADDWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDWHITELIST_CMD, pid_t)
148-#define FLASHCACHEDELWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELIST_CMD, pid_t)
149-#define FLASHCACHEDELALLWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELISTALL_CMD, pid_t)
150-
151-#endif
152
153=== added file 'Percona-Server/mysql-test/include/have_response_time_distribution.inc'
154--- Percona-Server/mysql-test/include/have_response_time_distribution.inc 1970-01-01 00:00:00 +0000
155+++ Percona-Server/mysql-test/include/have_response_time_distribution.inc 2013-05-26 07:24:39 +0000
156@@ -0,0 +1,4 @@
157+-- require r/have_response_time_distribution.require
158+disable_query_log;
159+show variables like 'have_response_time_distribution';
160+enable_query_log;
161
162=== removed file 'Percona-Server/mysql-test/include/have_response_time_distribution.inc'
163--- Percona-Server/mysql-test/include/have_response_time_distribution.inc 2012-04-18 23:25:50 +0000
164+++ Percona-Server/mysql-test/include/have_response_time_distribution.inc 1970-01-01 00:00:00 +0000
165@@ -1,4 +0,0 @@
166--- require r/have_response_time_distribution.require
167-disable_query_log;
168-show variables like 'have_response_time_distribution';
169-enable_query_log;
170
171=== added file 'Percona-Server/mysql-test/include/log_grep.inc'
172--- Percona-Server/mysql-test/include/log_grep.inc 1970-01-01 00:00:00 +0000
173+++ Percona-Server/mysql-test/include/log_grep.inc 2013-05-26 07:24:39 +0000
174@@ -0,0 +1,41 @@
175+--echo [log_grep.inc] file: $log_file pattern: $grep_pattern
176+perl;
177+ $log_file= $ENV{'log_file'};
178+ $log_file_full_path= $ENV{'log_file_full_path'};
179+ $log_slow_rate_test= $ENV{'log_slow_rate_test'};
180+ open(FILE, "$log_file_full_path")
181+ or die("Cannot open file $log_file_full_path: $!\n");
182+
183+ if ($log_slow_rate_test) {
184+ $one= 0;
185+ $two= 0;
186+ $three= 0;
187+ while(<FILE>) {
188+ $one++ if(/'connection_one'/);
189+ $two++ if(/'connection_two'/);
190+ $three++ if(/'connection_three'/);
191+ }
192+ $sum= $one + $two + $three;
193+ $zero= 0;
194+ if ($one == 0) {
195+ $zero++;
196+ }
197+ if ($two == 0) {
198+ $zero++;
199+ }
200+ if ($three == 0) {
201+ $zero++;
202+ }
203+ print "[log_grep.inc] sum: $sum\n";
204+ print "[log_grep.inc] zero: $zero\n";
205+ }
206+ else {
207+ $grep_pattern= $ENV{'grep_pattern'};
208+ $lines= 0;
209+ while(<FILE>) {
210+ $lines++ if (/$grep_pattern/);
211+ }
212+ print "[log_grep.inc] lines: $lines\n";
213+ }
214+ close(FILE);
215+EOF
216
217=== removed file 'Percona-Server/mysql-test/include/log_grep.inc'
218--- Percona-Server/mysql-test/include/log_grep.inc 2012-04-18 23:25:38 +0000
219+++ Percona-Server/mysql-test/include/log_grep.inc 1970-01-01 00:00:00 +0000
220@@ -1,41 +0,0 @@
221---echo [log_grep.inc] file: $log_file pattern: $grep_pattern
222-perl;
223- $log_file= $ENV{'log_file'};
224- $log_file_full_path= $ENV{'log_file_full_path'};
225- $log_slow_rate_test= $ENV{'log_slow_rate_test'};
226- open(FILE, "$log_file_full_path")
227- or die("Cannot open file $log_file_full_path: $!\n");
228-
229- if ($log_slow_rate_test) {
230- $one= 0;
231- $two= 0;
232- $three= 0;
233- while(<FILE>) {
234- $one++ if(/'connection_one'/);
235- $two++ if(/'connection_two'/);
236- $three++ if(/'connection_three'/);
237- }
238- $sum= $one + $two + $three;
239- $zero= 0;
240- if ($one == 0) {
241- $zero++;
242- }
243- if ($two == 0) {
244- $zero++;
245- }
246- if ($three == 0) {
247- $zero++;
248- }
249- print "[log_grep.inc] sum: $sum\n";
250- print "[log_grep.inc] zero: $zero\n";
251- }
252- else {
253- $grep_pattern= $ENV{'grep_pattern'};
254- $lines= 0;
255- while(<FILE>) {
256- $lines++ if (/$grep_pattern/);
257- }
258- print "[log_grep.inc] lines: $lines\n";
259- }
260- close(FILE);
261-EOF
262
263=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc'
264--- Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 1970-01-01 00:00:00 +0000
265+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 2013-05-26 07:24:39 +0000
266@@ -0,0 +1,95 @@
267+--source include/percona_query_cache_with_comments_clear.inc
268+let $query=/* with comment first */select * from t1;
269+eval $query;
270+--source include/percona_query_cache_with_comments_eval.inc
271+
272+let $query=# with comment first
273+select * from t1;
274+--source include/percona_query_cache_with_comments_eval.inc
275+
276+let $query=-- with comment first
277+select * from t1;
278+--source include/percona_query_cache_with_comments_eval.inc
279+
280+let $query=/* with comment first and "quote" */select * from t1;
281+--source include/percona_query_cache_with_comments_eval.inc
282+
283+let $query=# with comment first and "quote"
284+select * from t1;
285+--source include/percona_query_cache_with_comments_eval.inc
286+
287+let $query=-- with comment first and "quote"
288+select * from t1;
289+--source include/percona_query_cache_with_comments_eval.inc
290+
291+let $query=
292+ /* with comment and whitespaces first */select * from t1;
293+--source include/percona_query_cache_with_comments_eval.inc
294+
295+let $query=
296+ # with comment and whitespaces first
297+select * from t1;
298+--source include/percona_query_cache_with_comments_eval.inc
299+
300+let $query=
301+ -- with comment and whitespaces first
302+select * from t1;
303+--source include/percona_query_cache_with_comments_eval.inc
304+
305+let $internal=* internal comment *;
306+
307+let $query=select * /$internal/ from t1;
308+--source include/percona_query_cache_with_comments_eval.inc
309+let $query=select */$internal/ from t1;
310+--source include/percona_query_cache_with_comments_eval.inc
311+let $query=select */$internal/from t1;
312+--source include/percona_query_cache_with_comments_eval.inc
313+
314+let $internal=* internal comment with "quote" *;
315+
316+let $query=select * /$internal/ from t1;
317+--source include/percona_query_cache_with_comments_eval.inc
318+let $query=select */$internal/ from t1;
319+--source include/percona_query_cache_with_comments_eval.inc
320+let $query=select */$internal/from t1;
321+--source include/percona_query_cache_with_comments_eval.inc
322+
323+let $query=select * from t1
324+;
325+--source include/percona_query_cache_with_comments_eval.inc
326+
327+let $query=select * from t1 ;
328+--source include/percona_query_cache_with_comments_eval.inc
329+
330+let $query=select * from t1 ;
331+--source include/percona_query_cache_with_comments_eval.inc
332+
333+let $query=select * from t1
334+/* comment in the end */;
335+--source include/percona_query_cache_with_comments_eval.inc
336+
337+let $query=select * from t1
338+/* *\/ */;
339+--source include/percona_query_cache_with_comments_eval.inc
340+
341+let $query=select * from t1
342+/* comment in the end */
343+;
344+--source include/percona_query_cache_with_comments_eval.inc
345+
346+let $query=select * from t1 #comment in the end;
347+--source include/percona_query_cache_with_comments_eval.inc
348+
349+let $query=select * from t1 #comment in the end
350+;
351+--source include/percona_query_cache_with_comments_eval.inc
352+
353+let $query=select * from t1 -- comment in the end;
354+--source include/percona_query_cache_with_comments_eval.inc
355+
356+let $query=select * from t1 -- comment in the end
357+;
358+--source include/percona_query_cache_with_comments_eval.inc
359+
360+let $query=select ' \' ' from t1;
361+--source include/percona_query_cache_with_comments_eval.inc
362
363=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc'
364--- Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 2012-04-18 23:25:43 +0000
365+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 1970-01-01 00:00:00 +0000
366@@ -1,95 +0,0 @@
367---source include/percona_query_cache_with_comments_clear.inc
368-let $query=/* with comment first */select * from t1;
369-eval $query;
370---source include/percona_query_cache_with_comments_eval.inc
371-
372-let $query=# with comment first
373-select * from t1;
374---source include/percona_query_cache_with_comments_eval.inc
375-
376-let $query=-- with comment first
377-select * from t1;
378---source include/percona_query_cache_with_comments_eval.inc
379-
380-let $query=/* with comment first and "quote" */select * from t1;
381---source include/percona_query_cache_with_comments_eval.inc
382-
383-let $query=# with comment first and "quote"
384-select * from t1;
385---source include/percona_query_cache_with_comments_eval.inc
386-
387-let $query=-- with comment first and "quote"
388-select * from t1;
389---source include/percona_query_cache_with_comments_eval.inc
390-
391-let $query=
392- /* with comment and whitespaces first */select * from t1;
393---source include/percona_query_cache_with_comments_eval.inc
394-
395-let $query=
396- # with comment and whitespaces first
397-select * from t1;
398---source include/percona_query_cache_with_comments_eval.inc
399-
400-let $query=
401- -- with comment and whitespaces first
402-select * from t1;
403---source include/percona_query_cache_with_comments_eval.inc
404-
405-let $internal=* internal comment *;
406-
407-let $query=select * /$internal/ from t1;
408---source include/percona_query_cache_with_comments_eval.inc
409-let $query=select */$internal/ from t1;
410---source include/percona_query_cache_with_comments_eval.inc
411-let $query=select */$internal/from t1;
412---source include/percona_query_cache_with_comments_eval.inc
413-
414-let $internal=* internal comment with "quote" *;
415-
416-let $query=select * /$internal/ from t1;
417---source include/percona_query_cache_with_comments_eval.inc
418-let $query=select */$internal/ from t1;
419---source include/percona_query_cache_with_comments_eval.inc
420-let $query=select */$internal/from t1;
421---source include/percona_query_cache_with_comments_eval.inc
422-
423-let $query=select * from t1
424-;
425---source include/percona_query_cache_with_comments_eval.inc
426-
427-let $query=select * from t1 ;
428---source include/percona_query_cache_with_comments_eval.inc
429-
430-let $query=select * from t1 ;
431---source include/percona_query_cache_with_comments_eval.inc
432-
433-let $query=select * from t1
434-/* comment in the end */;
435---source include/percona_query_cache_with_comments_eval.inc
436-
437-let $query=select * from t1
438-/* *\/ */;
439---source include/percona_query_cache_with_comments_eval.inc
440-
441-let $query=select * from t1
442-/* comment in the end */
443-;
444---source include/percona_query_cache_with_comments_eval.inc
445-
446-let $query=select * from t1 #comment in the end;
447---source include/percona_query_cache_with_comments_eval.inc
448-
449-let $query=select * from t1 #comment in the end
450-;
451---source include/percona_query_cache_with_comments_eval.inc
452-
453-let $query=select * from t1 -- comment in the end;
454---source include/percona_query_cache_with_comments_eval.inc
455-
456-let $query=select * from t1 -- comment in the end
457-;
458---source include/percona_query_cache_with_comments_eval.inc
459-
460-let $query=select ' \' ' from t1;
461---source include/percona_query_cache_with_comments_eval.inc
462
463=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc'
464--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 1970-01-01 00:00:00 +0000
465+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 2013-05-26 07:24:39 +0000
466@@ -0,0 +1,12 @@
467+-- source include/have_query_cache.inc
468+
469+set GLOBAL query_cache_size=1355776;
470+
471+--disable_warnings
472+drop table if exists t1;
473+--enable_warnings
474+
475+create table t1 (a int not null);
476+insert into t1 values (1),(2),(3);
477+
478+--source include/percona_query_cache_with_comments_clear.inc
479
480=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc'
481--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 2012-04-18 23:25:43 +0000
482+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 1970-01-01 00:00:00 +0000
483@@ -1,12 +0,0 @@
484--- source include/have_query_cache.inc
485-
486-set GLOBAL query_cache_size=1355776;
487-
488---disable_warnings
489-drop table if exists t1;
490---enable_warnings
491-
492-create table t1 (a int not null);
493-insert into t1 values (1),(2),(3);
494-
495---source include/percona_query_cache_with_comments_clear.inc
496
497=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc'
498--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 1970-01-01 00:00:00 +0000
499+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 2013-05-26 07:24:39 +0000
500@@ -0,0 +1,5 @@
501+# Reset query cache variables.
502+flush query cache; # This crashed in some versions
503+flush query cache; # This crashed in some versions
504+reset query cache;
505+flush status;
506
507=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc'
508--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 2012-04-18 23:25:43 +0000
509+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 1970-01-01 00:00:00 +0000
510@@ -1,5 +0,0 @@
511-# Reset query cache variables.
512-flush query cache; # This crashed in some versions
513-flush query cache; # This crashed in some versions
514-reset query cache;
515-flush status;
516
517=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc'
518--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 1970-01-01 00:00:00 +0000
519+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 2013-05-26 07:24:39 +0000
520@@ -0,0 +1,3 @@
521+DROP TABLE t1;
522+SET GLOBAL query_cache_size=default;
523+set global query_cache_strip_comments=OFF;
524
525=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc'
526--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 2012-04-18 23:25:43 +0000
527+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 1970-01-01 00:00:00 +0000
528@@ -1,3 +0,0 @@
529-DROP TABLE t1;
530-SET GLOBAL query_cache_size=default;
531-set global query_cache_strip_comments=OFF;
532
533=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc'
534--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 1970-01-01 00:00:00 +0000
535+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 2013-05-26 07:24:39 +0000
536@@ -0,0 +1,7 @@
537+echo -----------------------------------------------------;
538+echo $query;
539+echo -----------------------------------------------------;
540+--source include/percona_query_cache_with_comments_show.inc
541+eval $query;
542+eval $query;
543+--source include/percona_query_cache_with_comments_show.inc
544
545=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc'
546--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 2012-04-18 23:25:43 +0000
547+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 1970-01-01 00:00:00 +0000
548@@ -1,7 +0,0 @@
549-echo -----------------------------------------------------;
550-echo $query;
551-echo -----------------------------------------------------;
552---source include/percona_query_cache_with_comments_show.inc
553-eval $query;
554-eval $query;
555---source include/percona_query_cache_with_comments_show.inc
556
557=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc'
558--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 1970-01-01 00:00:00 +0000
559+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 2013-05-26 07:24:39 +0000
560@@ -0,0 +1,8 @@
561+let $show=show status like "Qcache_queries_in_cache";
562+eval $show;
563+let $show=show status like "Qcache_inserts";
564+eval $show;
565+let $show=show status like "Qcache_hits";
566+eval $show;
567+
568+
569
570=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc'
571--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 2012-04-18 23:25:43 +0000
572+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 1970-01-01 00:00:00 +0000
573@@ -1,8 +0,0 @@
574-let $show=show status like "Qcache_queries_in_cache";
575-eval $show;
576-let $show=show status like "Qcache_inserts";
577-eval $show;
578-let $show=show status like "Qcache_hits";
579-eval $show;
580-
581-
582
583=== added file 'Percona-Server/mysql-test/include/percona_server_variables.inc'
584--- Percona-Server/mysql-test/include/percona_server_variables.inc 1970-01-01 00:00:00 +0000
585+++ Percona-Server/mysql-test/include/percona_server_variables.inc 2013-05-26 07:24:39 +0000
586@@ -0,0 +1,3 @@
587+--source include/have_response_time_distribution.inc
588+--source include/have_innodb.inc
589+SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
590
591=== removed file 'Percona-Server/mysql-test/include/percona_server_variables.inc'
592--- Percona-Server/mysql-test/include/percona_server_variables.inc 2012-04-18 23:26:11 +0000
593+++ Percona-Server/mysql-test/include/percona_server_variables.inc 1970-01-01 00:00:00 +0000
594@@ -1,3 +0,0 @@
595---source include/have_response_time_distribution.inc
596---source include/have_innodb.inc
597-SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
598
599=== added file 'Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc'
600--- Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 1970-01-01 00:00:00 +0000
601+++ Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 2013-05-26 07:24:39 +0000
602@@ -0,0 +1,56 @@
603+--echo
604+--disable_result_log
605+connection slave_lock;
606+--echo [slave_lock]
607+send SHOW SLAVE STATUS;
608+
609+connection slave;
610+--let $condition= 'SHOW SLAVE STATUS'
611+--source include/wait_show_condition.inc
612+
613+--disable_warnings
614+SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
615+--enable_warnings
616+
617+--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
618+--echo SIGNAL after SHOW SLAVE STATUS is $current
619+
620+connection slave;
621+--echo [slave]
622+SET DEBUG_SYNC='now SIGNAL signal.empty';
623+
624+connection slave_nolock;
625+--echo [slave_nolock]
626+send SHOW SLAVE STATUS NOLOCK;
627+
628+connection slave;
629+--let $condition= 'SHOW SLAVE STATUS NOLOCK'
630+--source include/wait_show_condition.inc
631+
632+--disable_warnings
633+SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
634+--enable_warnings
635+
636+--echo # should be 'signal.after_show_slave_status'
637+--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
638+--echo SIGNAL after SHOW SLAVE STATUS NOLOCK is $current
639+
640+connection slave;
641+--echo [slave]
642+SET DEBUG_SYNC='now SIGNAL signal.continue';
643+
644+connection slave_lock;
645+--disable_result_log
646+reap;
647+--enable_result_log
648+
649+connection slave_nolock;
650+--disable_result_log
651+reap;
652+--enable_result_log
653+
654+connection slave;
655+--echo [slave]
656+SET DEBUG_SYNC='now SIGNAL signal.empty';
657+--enable_result_log
658+--echo
659
660=== removed file 'Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc'
661--- Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 2012-04-18 23:25:57 +0000
662+++ Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 1970-01-01 00:00:00 +0000
663@@ -1,56 +0,0 @@
664---echo
665---disable_result_log
666-connection slave_lock;
667---echo [slave_lock]
668-send SHOW SLAVE STATUS;
669-
670-connection slave;
671---let $condition= 'SHOW SLAVE STATUS'
672---source include/wait_show_condition.inc
673-
674---disable_warnings
675-SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
676---enable_warnings
677-
678---let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
679---echo SIGNAL after SHOW SLAVE STATUS is $current
680-
681-connection slave;
682---echo [slave]
683-SET DEBUG_SYNC='now SIGNAL signal.empty';
684-
685-connection slave_nolock;
686---echo [slave_nolock]
687-send SHOW SLAVE STATUS NOLOCK;
688-
689-connection slave;
690---let $condition= 'SHOW SLAVE STATUS NOLOCK'
691---source include/wait_show_condition.inc
692-
693---disable_warnings
694-SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
695---enable_warnings
696-
697---echo # should be 'signal.after_show_slave_status'
698---let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
699---echo SIGNAL after SHOW SLAVE STATUS NOLOCK is $current
700-
701-connection slave;
702---echo [slave]
703-SET DEBUG_SYNC='now SIGNAL signal.continue';
704-
705-connection slave_lock;
706---disable_result_log
707-reap;
708---enable_result_log
709-
710-connection slave_nolock;
711---disable_result_log
712-reap;
713---enable_result_log
714-
715-connection slave;
716---echo [slave]
717-SET DEBUG_SYNC='now SIGNAL signal.empty';
718---enable_result_log
719---echo
720
721=== added file 'Percona-Server/mysql-test/include/query_response_time-replication.inc'
722--- Percona-Server/mysql-test/include/query_response_time-replication.inc 1970-01-01 00:00:00 +0000
723+++ Percona-Server/mysql-test/include/query_response_time-replication.inc 2013-05-26 07:24:39 +0000
724@@ -0,0 +1,58 @@
725+connection master;
726+
727+CREATE TABLE t(id INT);
728+
729+sync_slave_with_master;
730+
731+SET GLOBAL query_exec_time = 0.1;
732+--source include/restart_slave_sql.inc
733+
734+connection slave;
735+
736+SET SESSION query_exec_time=0.1;
737+
738+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
739+--eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base
740+FLUSH QUERY_RESPONSE_TIME;
741+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
742+
743+connection master;
744+
745+SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1);
746+SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1);
747+SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1);
748+SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1);
749+SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1);
750+SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1);
751+SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1);
752+SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1);
753+SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1);
754+SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1);
755+SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1);
756+SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1);
757+SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1);
758+SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1);
759+SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1);
760+SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1);
761+SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1);
762+SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1);
763+SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1);
764+SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1);
765+SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1);
766+SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1);
767+
768+sync_slave_with_master;
769+
770+connection slave;
771+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
772+SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
773+SHOW QUERY_RESPONSE_TIME;
774+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
775+
776+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
777+SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
778+
779+connection master;
780+DROP TABLE t;
781+
782+sync_slave_with_master;
783
784=== removed file 'Percona-Server/mysql-test/include/query_response_time-replication.inc'
785--- Percona-Server/mysql-test/include/query_response_time-replication.inc 2013-01-28 11:28:44 +0000
786+++ Percona-Server/mysql-test/include/query_response_time-replication.inc 1970-01-01 00:00:00 +0000
787@@ -1,58 +0,0 @@
788-connection master;
789-
790-CREATE TABLE t(id INT);
791-
792-sync_slave_with_master;
793-
794-SET GLOBAL query_exec_time = 0.1;
795---source include/restart_slave_sql.inc
796-
797-connection slave;
798-
799-SET SESSION query_exec_time=0.1;
800-
801-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
802---eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base
803-FLUSH QUERY_RESPONSE_TIME;
804-SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
805-
806-connection master;
807-
808-SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1);
809-SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1);
810-SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1);
811-SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1);
812-SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1);
813-SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1);
814-SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1);
815-SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1);
816-SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1);
817-SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1);
818-SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1);
819-SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1);
820-SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1);
821-SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1);
822-SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1);
823-SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1);
824-SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1);
825-SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1);
826-SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1);
827-SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1);
828-SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1);
829-SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1);
830-
831-sync_slave_with_master;
832-
833-connection slave;
834-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
835-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
836-SHOW QUERY_RESPONSE_TIME;
837-SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
838-
839-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
840-SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
841-
842-connection master;
843-DROP TABLE t;
844-
845-sync_slave_with_master;
846
847=== added file 'Percona-Server/mysql-test/include/query_response_time-stored.inc'
848--- Percona-Server/mysql-test/include/query_response_time-stored.inc 1970-01-01 00:00:00 +0000
849+++ Percona-Server/mysql-test/include/query_response_time-stored.inc 2013-05-26 07:24:39 +0000
850@@ -0,0 +1,37 @@
851+SET SESSION query_exec_time=0.1;
852+
853+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
854+EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
855+FLUSH QUERY_RESPONSE_TIME;
856+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
857+
858+CALL test_f(0.31);
859+CALL test_f(0.32);
860+CALL test_f(0.33);
861+CALL test_f(0.34);
862+CALL test_f(0.35);
863+CALL test_f(0.36);
864+CALL test_f(0.37);
865+CALL test_f(0.38);
866+CALL test_f(0.39);
867+CALL test_f(0.4);
868+CALL test_f(1.1);
869+CALL test_f(1.2);
870+CALL test_f(1.3);
871+CALL test_f(1.5);
872+CALL test_f(1.4);
873+CALL test_f(0.5);
874+CALL test_f(2.1);
875+CALL test_f(2.3);
876+CALL test_f(2.5);
877+CALL test_f(3.1);
878+CALL test_f(4.1);
879+CALL test_f(5.1);
880+
881+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
882+
883+SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
884+SHOW QUERY_RESPONSE_TIME;
885+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
886+
887+SET SESSION query_exec_time=default;
888
889=== removed file 'Percona-Server/mysql-test/include/query_response_time-stored.inc'
890--- Percona-Server/mysql-test/include/query_response_time-stored.inc 2012-04-18 23:25:50 +0000
891+++ Percona-Server/mysql-test/include/query_response_time-stored.inc 1970-01-01 00:00:00 +0000
892@@ -1,37 +0,0 @@
893-SET SESSION query_exec_time=0.1;
894-
895-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
896-EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
897-FLUSH QUERY_RESPONSE_TIME;
898-SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
899-
900-CALL test_f(0.31);
901-CALL test_f(0.32);
902-CALL test_f(0.33);
903-CALL test_f(0.34);
904-CALL test_f(0.35);
905-CALL test_f(0.36);
906-CALL test_f(0.37);
907-CALL test_f(0.38);
908-CALL test_f(0.39);
909-CALL test_f(0.4);
910-CALL test_f(1.1);
911-CALL test_f(1.2);
912-CALL test_f(1.3);
913-CALL test_f(1.5);
914-CALL test_f(1.4);
915-CALL test_f(0.5);
916-CALL test_f(2.1);
917-CALL test_f(2.3);
918-CALL test_f(2.5);
919-CALL test_f(3.1);
920-CALL test_f(4.1);
921-CALL test_f(5.1);
922-
923-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
924-
925-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
926-SHOW QUERY_RESPONSE_TIME;
927-SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
928-
929-SET SESSION query_exec_time=default;
930
931=== added file 'Percona-Server/mysql-test/include/query_response_time.inc'
932--- Percona-Server/mysql-test/include/query_response_time.inc 1970-01-01 00:00:00 +0000
933+++ Percona-Server/mysql-test/include/query_response_time.inc 2013-05-26 07:24:39 +0000
934@@ -0,0 +1,43 @@
935+SET SESSION query_exec_time=0.1;
936+
937+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
938+EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
939+FLUSH QUERY_RESPONSE_TIME;
940+# Following two queries check works of FLUSH and
941+# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312)
942+SHOW QUERY_RESPONSE_TIME;
943+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
944+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
945+
946+SET SESSION query_exec_time=0.31; SELECT 1;
947+SET SESSION query_exec_time=0.32; SELECT 1;
948+SET SESSION query_exec_time=0.33; SELECT 1;
949+SET SESSION query_exec_time=0.34; SELECT 1;
950+SET SESSION query_exec_time=0.35; SELECT 1;
951+SET SESSION query_exec_time=0.36; SELECT 1;
952+SET SESSION query_exec_time=0.37; SELECT 1;
953+SET SESSION query_exec_time=0.38; SELECT 1;
954+SET SESSION query_exec_time=0.39; SELECT 1;
955+SET SESSION query_exec_time=0.4; SELECT 1;
956+SET SESSION query_exec_time=1.1; SELECT 1;
957+SET SESSION query_exec_time=1.2; SELECT 1;
958+SET SESSION query_exec_time=1.3; SELECT 1;
959+SET SESSION query_exec_time=1.5; SELECT 1;
960+SET SESSION query_exec_time=1.4; SELECT 1;
961+SET SESSION query_exec_time=0.5; SELECT 1;
962+SET SESSION query_exec_time=2.1; SELECT 1;
963+SET SESSION query_exec_time=2.3; SELECT 1;
964+SET SESSION query_exec_time=2.5; SELECT 1;
965+SET SESSION query_exec_time=3.1; SELECT 1;
966+SET SESSION query_exec_time=4.1; SELECT 1;
967+SET SESSION query_exec_time=5.1; SELECT 1;
968+
969+SET SESSION query_exec_time=0.1;
970+
971+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
972+
973+SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
974+SHOW QUERY_RESPONSE_TIME;
975+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
976+
977+SET SESSION query_exec_time=default;
978
979=== removed file 'Percona-Server/mysql-test/include/query_response_time.inc'
980--- Percona-Server/mysql-test/include/query_response_time.inc 2012-04-18 23:25:50 +0000
981+++ Percona-Server/mysql-test/include/query_response_time.inc 1970-01-01 00:00:00 +0000
982@@ -1,43 +0,0 @@
983-SET SESSION query_exec_time=0.1;
984-
985-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
986-EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
987-FLUSH QUERY_RESPONSE_TIME;
988-# Following two queries check works of FLUSH and
989-# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312)
990-SHOW QUERY_RESPONSE_TIME;
991-SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
992-SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
993-
994-SET SESSION query_exec_time=0.31; SELECT 1;
995-SET SESSION query_exec_time=0.32; SELECT 1;
996-SET SESSION query_exec_time=0.33; SELECT 1;
997-SET SESSION query_exec_time=0.34; SELECT 1;
998-SET SESSION query_exec_time=0.35; SELECT 1;
999-SET SESSION query_exec_time=0.36; SELECT 1;
1000-SET SESSION query_exec_time=0.37; SELECT 1;
1001-SET SESSION query_exec_time=0.38; SELECT 1;
1002-SET SESSION query_exec_time=0.39; SELECT 1;
1003-SET SESSION query_exec_time=0.4; SELECT 1;
1004-SET SESSION query_exec_time=1.1; SELECT 1;
1005-SET SESSION query_exec_time=1.2; SELECT 1;
1006-SET SESSION query_exec_time=1.3; SELECT 1;
1007-SET SESSION query_exec_time=1.5; SELECT 1;
1008-SET SESSION query_exec_time=1.4; SELECT 1;
1009-SET SESSION query_exec_time=0.5; SELECT 1;
1010-SET SESSION query_exec_time=2.1; SELECT 1;
1011-SET SESSION query_exec_time=2.3; SELECT 1;
1012-SET SESSION query_exec_time=2.5; SELECT 1;
1013-SET SESSION query_exec_time=3.1; SELECT 1;
1014-SET SESSION query_exec_time=4.1; SELECT 1;
1015-SET SESSION query_exec_time=5.1; SELECT 1;
1016-
1017-SET SESSION query_exec_time=0.1;
1018-
1019-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1020-
1021-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
1022-SHOW QUERY_RESPONSE_TIME;
1023-SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1024-
1025-SET SESSION query_exec_time=default;
1026
1027=== added file 'Percona-Server/mysql-test/lib/Subunit.pm'
1028--- Percona-Server/mysql-test/lib/Subunit.pm 1970-01-01 00:00:00 +0000
1029+++ Percona-Server/mysql-test/lib/Subunit.pm 2013-05-26 07:24:39 +0000
1030@@ -0,0 +1,94 @@
1031+# Perl module for parsing and generating the Subunit protocol
1032+# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
1033+#
1034+# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
1035+# license at the users choice. A copy of both licenses are available in the
1036+# project source as Apache-2.0 and BSD. You may not use this file except in
1037+# compliance with one of these two licences.
1038+#
1039+# Unless required by applicable law or agreed to in writing, software
1040+# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
1041+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1042+# license you chose for the specific language governing permissions and
1043+# limitations under that license.
1044+
1045+package Subunit;
1046+use POSIX;
1047+
1048+use vars qw ( $VERSION );
1049+
1050+$VERSION = '0.0.2';
1051+
1052+use strict;
1053+my $SUBUNIT_OUT= 'test_results.subunit';
1054+# reset the file
1055+open(SUBUNITOUT, ">$SUBUNIT_OUT");
1056+close(SUBUNITOUT);
1057+
1058+sub subunit_start_test($)
1059+{
1060+ my ($testname) = @_;
1061+ open(SUBUNITOUT, ">>$SUBUNIT_OUT");
1062+ print SUBUNITOUT "test: $testname\n";
1063+ close(SUBUNITOUT);
1064+ return;
1065+}
1066+
1067+sub subunit_end_test($$;$)
1068+{
1069+ my $name = shift;
1070+ my $result = shift;
1071+ my $reason = shift;
1072+ open(SUBUNITOUT, ">>$SUBUNIT_OUT");
1073+ if ($reason) {
1074+ print SUBUNITOUT "$result: $name [\n";
1075+ print SUBUNITOUT "$reason\n";
1076+ print SUBUNITOUT "]\n";
1077+ } else {
1078+ print SUBUNITOUT "$result: $name\n";
1079+ }
1080+ close(SUBUNITOUT);
1081+ return;
1082+}
1083+
1084+sub subunit_skip_test($;$)
1085+{
1086+ my $name = shift;
1087+ my $reason = shift;
1088+ subunit_end_test($name, "skip", $reason);
1089+}
1090+
1091+sub subunit_fail_test($;$)
1092+{
1093+ my $name = shift;
1094+ my $reason = shift;
1095+ subunit_end_test($name, "failure", $reason);
1096+}
1097+
1098+sub subunit_pass_test($;$)
1099+{
1100+ my $name = shift;
1101+ my $reason = shift;
1102+ subunit_end_test($name, "success", $reason);
1103+}
1104+
1105+sub subunit_xfail_test($;$)
1106+{
1107+ my $name = shift;
1108+ my $reason = shift;
1109+ subunit_end_test($name, "xfail", $reason);
1110+}
1111+
1112+sub report_time($)
1113+{
1114+ my ($time) = @_;
1115+ my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
1116+ open(SUBUNITOUT, ">>$SUBUNIT_OUT");
1117+ printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, ($mon+1), $mday, $hour, $min, $sec;
1118+ close(SUBUNITOUT);
1119+ return;
1120+}
1121+
1122+
1123+
1124+1;
1125
1126=== removed file 'Percona-Server/mysql-test/lib/Subunit.pm'
1127--- Percona-Server/mysql-test/lib/Subunit.pm 2012-04-18 23:26:32 +0000
1128+++ Percona-Server/mysql-test/lib/Subunit.pm 1970-01-01 00:00:00 +0000
1129@@ -1,94 +0,0 @@
1130-# Perl module for parsing and generating the Subunit protocol
1131-# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
1132-#
1133-# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
1134-# license at the users choice. A copy of both licenses are available in the
1135-# project source as Apache-2.0 and BSD. You may not use this file except in
1136-# compliance with one of these two licences.
1137-#
1138-# Unless required by applicable law or agreed to in writing, software
1139-# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
1140-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1141-# license you chose for the specific language governing permissions and
1142-# limitations under that license.
1143-
1144-package Subunit;
1145-use POSIX;
1146-
1147-use vars qw ( $VERSION );
1148-
1149-$VERSION = '0.0.2';
1150-
1151-use strict;
1152-my $SUBUNIT_OUT= 'test_results.subunit';
1153-# reset the file
1154-open(SUBUNITOUT, ">$SUBUNIT_OUT");
1155-close(SUBUNITOUT);
1156-
1157-sub subunit_start_test($)
1158-{
1159- my ($testname) = @_;
1160- open(SUBUNITOUT, ">>$SUBUNIT_OUT");
1161- print SUBUNITOUT "test: $testname\n";
1162- close(SUBUNITOUT);
1163- return;
1164-}
1165-
1166-sub subunit_end_test($$;$)
1167-{
1168- my $name = shift;
1169- my $result = shift;
1170- my $reason = shift;
1171- open(SUBUNITOUT, ">>$SUBUNIT_OUT");
1172- if ($reason) {
1173- print SUBUNITOUT "$result: $name [\n";
1174- print SUBUNITOUT "$reason\n";
1175- print SUBUNITOUT "]\n";
1176- } else {
1177- print SUBUNITOUT "$result: $name\n";
1178- }
1179- close(SUBUNITOUT);
1180- return;
1181-}
1182-
1183-sub subunit_skip_test($;$)
1184-{
1185- my $name = shift;
1186- my $reason = shift;
1187- subunit_end_test($name, "skip", $reason);
1188-}
1189-
1190-sub subunit_fail_test($;$)
1191-{
1192- my $name = shift;
1193- my $reason = shift;
1194- subunit_end_test($name, "failure", $reason);
1195-}
1196-
1197-sub subunit_pass_test($;$)
1198-{
1199- my $name = shift;
1200- my $reason = shift;
1201- subunit_end_test($name, "success", $reason);
1202-}
1203-
1204-sub subunit_xfail_test($;$)
1205-{
1206- my $name = shift;
1207- my $reason = shift;
1208- subunit_end_test($name, "xfail", $reason);
1209-}
1210-
1211-sub report_time($)
1212-{
1213- my ($time) = @_;
1214- my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
1215- open(SUBUNITOUT, ">>$SUBUNIT_OUT");
1216- printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, ($mon+1), $mday, $hour, $min, $sec;
1217- close(SUBUNITOUT);
1218- return;
1219-}
1220-
1221-
1222-
1223-1;
1224
1225=== added file 'Percona-Server/mysql-test/r/have_response_time_distribution.require'
1226--- Percona-Server/mysql-test/r/have_response_time_distribution.require 1970-01-01 00:00:00 +0000
1227+++ Percona-Server/mysql-test/r/have_response_time_distribution.require 2013-05-26 07:24:39 +0000
1228@@ -0,0 +1,2 @@
1229+Variable_name Value
1230+have_response_time_distribution YES
1231
1232=== removed file 'Percona-Server/mysql-test/r/have_response_time_distribution.require'
1233--- Percona-Server/mysql-test/r/have_response_time_distribution.require 2012-04-18 23:25:50 +0000
1234+++ Percona-Server/mysql-test/r/have_response_time_distribution.require 1970-01-01 00:00:00 +0000
1235@@ -1,2 +0,0 @@
1236-Variable_name Value
1237-have_response_time_distribution YES
1238
1239=== added file 'Percona-Server/mysql-test/r/percona_bug45702.result'
1240--- Percona-Server/mysql-test/r/percona_bug45702.result 1970-01-01 00:00:00 +0000
1241+++ Percona-Server/mysql-test/r/percona_bug45702.result 2013-05-26 07:24:39 +0000
1242@@ -0,0 +1,21 @@
1243+CREATE TABLE t1 (a BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM;
1244+INSERT INTO t1 VALUES (), (), (), (), (), (), (), ();
1245+INSERT INTO t1 SELECT NULL FROM t1;
1246+INSERT INTO t1 SELECT NULL FROM t1;
1247+INSERT INTO t1 SELECT NULL FROM t1;
1248+INSERT INTO t1 SELECT NULL FROM t1;
1249+INSERT INTO t1 SELECT NULL FROM t1;
1250+INSERT INTO t1 SELECT NULL FROM t1;
1251+INSERT INTO t1 SELECT NULL FROM t1;
1252+INSERT INTO t1 SELECT NULL FROM t1;
1253+INSERT INTO t1 SELECT NULL FROM t1;
1254+SET @old_myisam_sort_buffer_size = @@myisam_sort_buffer_size;
1255+SET @@myisam_sort_buffer_size = 4 * 1024 * 1024 * 1024;
1256+REPAIR TABLE t1;
1257+Table Op Msg_type Msg_text
1258+test.t1 repair status OK
1259+- recovering (with sort) MyISAM-table 'MYSQLD_DATADIR/test/t1'
1260+Data records: 4096
1261+- Fixing index 1
1262+SET @@myisam_sort_buffer_size = @old_myisam_sort_buffer_size;
1263+DROP TABLE t1;
1264
1265=== removed file 'Percona-Server/mysql-test/r/percona_bug45702.result'
1266--- Percona-Server/mysql-test/r/percona_bug45702.result 2012-04-18 23:26:36 +0000
1267+++ Percona-Server/mysql-test/r/percona_bug45702.result 1970-01-01 00:00:00 +0000
1268@@ -1,21 +0,0 @@
1269-CREATE TABLE t1 (a BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM;
1270-INSERT INTO t1 VALUES (), (), (), (), (), (), (), ();
1271-INSERT INTO t1 SELECT NULL FROM t1;
1272-INSERT INTO t1 SELECT NULL FROM t1;
1273-INSERT INTO t1 SELECT NULL FROM t1;
1274-INSERT INTO t1 SELECT NULL FROM t1;
1275-INSERT INTO t1 SELECT NULL FROM t1;
1276-INSERT INTO t1 SELECT NULL FROM t1;
1277-INSERT INTO t1 SELECT NULL FROM t1;
1278-INSERT INTO t1 SELECT NULL FROM t1;
1279-INSERT INTO t1 SELECT NULL FROM t1;
1280-SET @old_myisam_sort_buffer_size = @@myisam_sort_buffer_size;
1281-SET @@myisam_sort_buffer_size = 4 * 1024 * 1024 * 1024;
1282-REPAIR TABLE t1;
1283-Table Op Msg_type Msg_text
1284-test.t1 repair status OK
1285-- recovering (with sort) MyISAM-table 'MYSQLD_DATADIR/test/t1'
1286-Data records: 4096
1287-- Fixing index 1
1288-SET @@myisam_sort_buffer_size = @old_myisam_sort_buffer_size;
1289-DROP TABLE t1;
1290
1291=== added file 'Percona-Server/mysql-test/r/percona_bug933969.result'
1292--- Percona-Server/mysql-test/r/percona_bug933969.result 1970-01-01 00:00:00 +0000
1293+++ Percona-Server/mysql-test/r/percona_bug933969.result 2013-05-26 07:24:39 +0000
1294@@ -0,0 +1,16 @@
1295+RESET MASTER;
1296+DROP TABLE IF EXISTS t1;
1297+CREATE TABLE t1 (word VARCHAR(20));
1298+INSERT INTO t1 VALUES ("hamite");
1299+INSERT INTO t1 VALUES ("hoho");
1300+INSERT INTO t1 VALUES ("znamenito");
1301+INSERT INTO t1 VALUES ("mrachny");
1302+INSERT INTO t1 VALUES ("mrak");
1303+INSERT INTO t1 VALUES ("zhut");
1304+INSERT INTO t1 VALUES ("parnisha");
1305+INSERT INTO t1 VALUES ("krrasota!");
1306+INSERT INTO t1 VALUES ("podumayesh");
1307+INSERT INTO t1 VALUES ("ogo!");
1308+FLUSH LOGS;
1309+DROP TABLE t1;
1310+RESET MASTER;
1311
1312=== removed file 'Percona-Server/mysql-test/r/percona_bug933969.result'
1313--- Percona-Server/mysql-test/r/percona_bug933969.result 2012-04-18 23:24:34 +0000
1314+++ Percona-Server/mysql-test/r/percona_bug933969.result 1970-01-01 00:00:00 +0000
1315@@ -1,16 +0,0 @@
1316-RESET MASTER;
1317-DROP TABLE IF EXISTS t1;
1318-CREATE TABLE t1 (word VARCHAR(20));
1319-INSERT INTO t1 VALUES ("hamite");
1320-INSERT INTO t1 VALUES ("hoho");
1321-INSERT INTO t1 VALUES ("znamenito");
1322-INSERT INTO t1 VALUES ("mrachny");
1323-INSERT INTO t1 VALUES ("mrak");
1324-INSERT INTO t1 VALUES ("zhut");
1325-INSERT INTO t1 VALUES ("parnisha");
1326-INSERT INTO t1 VALUES ("krrasota!");
1327-INSERT INTO t1 VALUES ("podumayesh");
1328-INSERT INTO t1 VALUES ("ogo!");
1329-FLUSH LOGS;
1330-DROP TABLE t1;
1331-RESET MASTER;
1332
1333=== added file 'Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result'
1334--- Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 1970-01-01 00:00:00 +0000
1335+++ Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 2013-05-26 07:24:39 +0000
1336@@ -0,0 +1,4 @@
1337+show variables like 'innodb_buffer_pool_shm%';
1338+Variable_name Value
1339+innodb_buffer_pool_shm_checksum ON
1340+innodb_buffer_pool_shm_key 123456
1341
1342=== removed file 'Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result'
1343--- Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 2012-04-18 23:25:30 +0000
1344+++ Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 1970-01-01 00:00:00 +0000
1345@@ -1,4 +0,0 @@
1346-show variables like 'innodb_buffer_pool_shm%';
1347-Variable_name Value
1348-innodb_buffer_pool_shm_checksum ON
1349-innodb_buffer_pool_shm_key 123456
1350
1351=== added file 'Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result'
1352--- Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 1970-01-01 00:00:00 +0000
1353+++ Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 2013-05-26 07:24:39 +0000
1354@@ -0,0 +1,28 @@
1355+# Establish connection con1 (user=root)
1356+# Establish connection con2 (user=root)
1357+# Establish connection con3 (user=root)
1358+# Drop test table
1359+drop table if exists t;
1360+# Create test table
1361+create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
1362+# Insert two rows to test table
1363+insert into t values(2,1);
1364+insert into t values(1,2);
1365+# Switch to connection con1
1366+BEGIN;
1367+SELECT b FROM t WHERE a=1 FOR UPDATE;
1368+# Switch to connection con2
1369+BEGIN;
1370+SELECT b FROM t WHERE a=2 FOR UPDATE;
1371+# Switch to connection con1
1372+SELECT b FROM t WHERE a=2 FOR UPDATE;
1373+# Switch to connection con2
1374+SELECT b FROM t WHERE a=1 FOR UPDATE;
1375+# Switch to connection con1
1376+ROLLBACK;
1377+# Switch to connection con2
1378+ROLLBACK;
1379+# Switch to connection con3
1380+Deadlocks: 1
1381+# Drop test table
1382+drop table t;
1383
1384=== removed file 'Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result'
1385--- Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 2012-04-18 23:25:25 +0000
1386+++ Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 1970-01-01 00:00:00 +0000
1387@@ -1,28 +0,0 @@
1388-# Establish connection con1 (user=root)
1389-# Establish connection con2 (user=root)
1390-# Establish connection con3 (user=root)
1391-# Drop test table
1392-drop table if exists t;
1393-# Create test table
1394-create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
1395-# Insert two rows to test table
1396-insert into t values(2,1);
1397-insert into t values(1,2);
1398-# Switch to connection con1
1399-BEGIN;
1400-SELECT b FROM t WHERE a=1 FOR UPDATE;
1401-# Switch to connection con2
1402-BEGIN;
1403-SELECT b FROM t WHERE a=2 FOR UPDATE;
1404-# Switch to connection con1
1405-SELECT b FROM t WHERE a=2 FOR UPDATE;
1406-# Switch to connection con2
1407-SELECT b FROM t WHERE a=1 FOR UPDATE;
1408-# Switch to connection con1
1409-ROLLBACK;
1410-# Switch to connection con2
1411-ROLLBACK;
1412-# Switch to connection con3
1413-Deadlocks: 1
1414-# Drop test table
1415-drop table t;
1416
1417=== added file 'Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result'
1418--- Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 1970-01-01 00:00:00 +0000
1419+++ Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 2013-05-26 07:24:39 +0000
1420@@ -0,0 +1,4 @@
1421+show variables like 'innodb_doublewrite%';
1422+Variable_name Value
1423+innodb_doublewrite ON
1424+innodb_doublewrite_file ib_doublewrite
1425
1426=== removed file 'Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result'
1427--- Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 2012-04-18 23:25:15 +0000
1428+++ Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 1970-01-01 00:00:00 +0000
1429@@ -1,4 +0,0 @@
1430-show variables like 'innodb_doublewrite%';
1431-Variable_name Value
1432-innodb_doublewrite ON
1433-innodb_doublewrite_file ib_doublewrite
1434
1435=== added file 'Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result'
1436--- Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 1970-01-01 00:00:00 +0000
1437+++ Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 2013-05-26 07:24:39 +0000
1438@@ -0,0 +1,64 @@
1439+CREATE TABLE t1(
1440+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
1441+a CHAR(1) NOT NULL,
1442+b CHAR(36) NOT NULL) ENGINE=InnoDB;
1443+INSERT INTO t1(a,b) VALUES ('a','b');
1444+INSERT INTO t1(a,b) SELECT a,b FROM t1;
1445+INSERT INTO t1(a,b) SELECT a,b FROM t1;
1446+INSERT INTO t1(a,b) SELECT a,b FROM t1;
1447+INSERT INTO t1(a,b) SELECT a,b FROM t1;
1448+ALTER TABLE t1 ADD KEY (a);
1449+affected rows: 0
1450+info: Records: 0 Duplicates: 0 Warnings: 0
1451+EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
1452+id 1
1453+select_type SIMPLE
1454+table t1
1455+type ALL
1456+possible_keys a
1457+key NULL
1458+key_len NULL
1459+ref NULL
1460+rows 16
1461+Extra
1462+id 1
1463+select_type SIMPLE
1464+table t2
1465+type ref
1466+possible_keys a
1467+key a
1468+key_len 1
1469+ref test.t1.a
1470+rows 1
1471+Extra Using where
1472+ALTER TABLE t1 DROP KEY a;
1473+SET expand_fast_index_creation = 1;
1474+SELECT @@expand_fast_index_creation;
1475+@@expand_fast_index_creation
1476+1
1477+ALTER TABLE t1 ADD KEY (a);
1478+affected rows: 0
1479+info: Records: 0 Duplicates: 0 Warnings: 0
1480+EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
1481+id 1
1482+select_type SIMPLE
1483+table t1
1484+type ALL
1485+possible_keys a
1486+key NULL
1487+key_len NULL
1488+ref NULL
1489+rows 16
1490+Extra
1491+id 1
1492+select_type SIMPLE
1493+table t2
1494+type ALL
1495+possible_keys a
1496+key NULL
1497+key_len NULL
1498+ref NULL
1499+rows 16
1500+Extra Using where; Using join buffer
1501+SET expand_fast_index_creation = 0;
1502+DROP TABLE t1;
1503
1504=== removed file 'Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result'
1505--- Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 2012-04-18 23:26:09 +0000
1506+++ Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 1970-01-01 00:00:00 +0000
1507@@ -1,64 +0,0 @@
1508-CREATE TABLE t1(
1509-id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
1510-a CHAR(1) NOT NULL,
1511-b CHAR(36) NOT NULL) ENGINE=InnoDB;
1512-INSERT INTO t1(a,b) VALUES ('a','b');
1513-INSERT INTO t1(a,b) SELECT a,b FROM t1;
1514-INSERT INTO t1(a,b) SELECT a,b FROM t1;
1515-INSERT INTO t1(a,b) SELECT a,b FROM t1;
1516-INSERT INTO t1(a,b) SELECT a,b FROM t1;
1517-ALTER TABLE t1 ADD KEY (a);
1518-affected rows: 0
1519-info: Records: 0 Duplicates: 0 Warnings: 0
1520-EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
1521-id 1
1522-select_type SIMPLE
1523-table t1
1524-type ALL
1525-possible_keys a
1526-key NULL
1527-key_len NULL
1528-ref NULL
1529-rows 16
1530-Extra
1531-id 1
1532-select_type SIMPLE
1533-table t2
1534-type ref
1535-possible_keys a
1536-key a
1537-key_len 1
1538-ref test.t1.a
1539-rows 1
1540-Extra Using where
1541-ALTER TABLE t1 DROP KEY a;
1542-SET expand_fast_index_creation = 1;
1543-SELECT @@expand_fast_index_creation;
1544-@@expand_fast_index_creation
1545-1
1546-ALTER TABLE t1 ADD KEY (a);
1547-affected rows: 0
1548-info: Records: 0 Duplicates: 0 Warnings: 0
1549-EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
1550-id 1
1551-select_type SIMPLE
1552-table t1
1553-type ALL
1554-possible_keys a
1555-key NULL
1556-key_len NULL
1557-ref NULL
1558-rows 16
1559-Extra
1560-id 1
1561-select_type SIMPLE
1562-table t2
1563-type ALL
1564-possible_keys a
1565-key NULL
1566-key_len NULL
1567-ref NULL
1568-rows 16
1569-Extra Using where; Using join buffer
1570-SET expand_fast_index_creation = 0;
1571-DROP TABLE t1;
1572
1573=== added file 'Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result'
1574--- Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 1970-01-01 00:00:00 +0000
1575+++ Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 2013-05-26 07:24:39 +0000
1576@@ -0,0 +1,3 @@
1577+show variables like 'innodb_use_sys_stats%';
1578+Variable_name Value
1579+innodb_use_sys_stats_table ON
1580
1581=== removed file 'Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result'
1582--- Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 2012-04-18 23:25:04 +0000
1583+++ Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 1970-01-01 00:00:00 +0000
1584@@ -1,3 +0,0 @@
1585-show variables like 'innodb_use_sys_stats%';
1586-Variable_name Value
1587-innodb_use_sys_stats_table ON
1588
1589=== added file 'Percona-Server/mysql-test/r/percona_innodb_version.result'
1590--- Percona-Server/mysql-test/r/percona_innodb_version.result 1970-01-01 00:00:00 +0000
1591+++ Percona-Server/mysql-test/r/percona_innodb_version.result 2013-05-26 07:24:39 +0000
1592@@ -0,0 +1,3 @@
1593+SELECT @@innodb_version;
1594+@@innodb_version
1595+5.5.x-x.x
1596
1597=== removed file 'Percona-Server/mysql-test/r/percona_innodb_version.result'
1598--- Percona-Server/mysql-test/r/percona_innodb_version.result 2013-02-18 04:48:10 +0000
1599+++ Percona-Server/mysql-test/r/percona_innodb_version.result 1970-01-01 00:00:00 +0000
1600@@ -1,3 +0,0 @@
1601-SELECT @@innodb_version;
1602-@@innodb_version
1603-5.5.x-x.x
1604
1605=== added file 'Percona-Server/mysql-test/r/percona_log_connection_error.result'
1606--- Percona-Server/mysql-test/r/percona_log_connection_error.result 1970-01-01 00:00:00 +0000
1607+++ Percona-Server/mysql-test/r/percona_log_connection_error.result 2013-05-26 07:24:39 +0000
1608@@ -0,0 +1,16 @@
1609+SET @old_max_connections = @@max_connections;
1610+SET @old_log_warnings = @@log_warnings;
1611+SET GLOBAL max_connections=2;
1612+SET GLOBAL LOG_WARNINGS = 0;
1613+connect(localhost,root,,test,port,socket);
1614+ERROR HY000: Too many connections
1615+SET GLOBAL LOG_WARNINGS = 1;
1616+connect(localhost,root,,test,port,socket);
1617+ERROR HY000: Too many connections
1618+SET GLOBAL LOG_WARNINGS = 0;
1619+connect(localhost,root,,test,port,socket);
1620+ERROR HY000: Too many connections
1621+SET GLOBAL max_connections = @old_max_connections;
1622+SET GLOBAL log_warnings = @old_log_warnings;
1623+[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
1624+[log_grep.inc] lines: 1
1625
1626=== removed file 'Percona-Server/mysql-test/r/percona_log_connection_error.result'
1627--- Percona-Server/mysql-test/r/percona_log_connection_error.result 2012-04-18 23:25:45 +0000
1628+++ Percona-Server/mysql-test/r/percona_log_connection_error.result 1970-01-01 00:00:00 +0000
1629@@ -1,16 +0,0 @@
1630-SET @old_max_connections = @@max_connections;
1631-SET @old_log_warnings = @@log_warnings;
1632-SET GLOBAL max_connections=2;
1633-SET GLOBAL LOG_WARNINGS = 0;
1634-connect(localhost,root,,test,port,socket);
1635-ERROR HY000: Too many connections
1636-SET GLOBAL LOG_WARNINGS = 1;
1637-connect(localhost,root,,test,port,socket);
1638-ERROR HY000: Too many connections
1639-SET GLOBAL LOG_WARNINGS = 0;
1640-connect(localhost,root,,test,port,socket);
1641-ERROR HY000: Too many connections
1642-SET GLOBAL max_connections = @old_max_connections;
1643-SET GLOBAL log_warnings = @old_log_warnings;
1644-[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
1645-[log_grep.inc] lines: 1
1646
1647=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result'
1648--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 1970-01-01 00:00:00 +0000
1649+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 2013-05-26 07:24:39 +0000
1650@@ -0,0 +1,6 @@
1651+SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1652+Variable_name Value
1653+log_slow_admin_statements ON
1654+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1655+VARIABLE_NAME VARIABLE_VALUE
1656+LOG_SLOW_ADMIN_STATEMENTS ON
1657
1658=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result'
1659--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 2012-04-18 23:25:38 +0000
1660+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 1970-01-01 00:00:00 +0000
1661@@ -1,6 +0,0 @@
1662-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1663-Variable_name Value
1664-log_slow_admin_statements ON
1665-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1666-VARIABLE_NAME VARIABLE_VALUE
1667-LOG_SLOW_ADMIN_STATEMENTS ON
1668
1669=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result'
1670--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 1970-01-01 00:00:00 +0000
1671+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 2013-05-26 07:24:39 +0000
1672@@ -0,0 +1,6 @@
1673+SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1674+Variable_name Value
1675+log_slow_admin_statements OFF
1676+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1677+VARIABLE_NAME VARIABLE_VALUE
1678+LOG_SLOW_ADMIN_STATEMENTS OFF
1679
1680=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result'
1681--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 2012-04-18 23:25:38 +0000
1682+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 1970-01-01 00:00:00 +0000
1683@@ -1,6 +0,0 @@
1684-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1685-Variable_name Value
1686-log_slow_admin_statements OFF
1687-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1688-VARIABLE_NAME VARIABLE_VALUE
1689-LOG_SLOW_ADMIN_STATEMENTS OFF
1690
1691=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result'
1692--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 1970-01-01 00:00:00 +0000
1693+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 2013-05-26 07:24:39 +0000
1694@@ -0,0 +1,7 @@
1695+call mtr.add_suppression("option 'log_slow_admin_statements': boolean value 'foo' wasn't recognized. Set to OFF.");
1696+SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1697+Variable_name Value
1698+log_slow_admin_statements OFF
1699+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1700+VARIABLE_NAME VARIABLE_VALUE
1701+LOG_SLOW_ADMIN_STATEMENTS OFF
1702
1703=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result'
1704--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 2012-04-18 23:25:38 +0000
1705+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 1970-01-01 00:00:00 +0000
1706@@ -1,7 +0,0 @@
1707-call mtr.add_suppression("option 'log_slow_admin_statements': boolean value 'foo' wasn't recognized. Set to OFF.");
1708-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1709-Variable_name Value
1710-log_slow_admin_statements OFF
1711-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1712-VARIABLE_NAME VARIABLE_VALUE
1713-LOG_SLOW_ADMIN_STATEMENTS OFF
1714
1715=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result'
1716--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 1970-01-01 00:00:00 +0000
1717+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 2013-05-26 07:24:39 +0000
1718@@ -0,0 +1,6 @@
1719+SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1720+Variable_name Value
1721+log_slow_admin_statements ON
1722+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1723+VARIABLE_NAME VARIABLE_VALUE
1724+LOG_SLOW_ADMIN_STATEMENTS ON
1725
1726=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result'
1727--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 2012-04-18 23:25:38 +0000
1728+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 1970-01-01 00:00:00 +0000
1729@@ -1,6 +0,0 @@
1730-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
1731-Variable_name Value
1732-log_slow_admin_statements ON
1733-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
1734-VARIABLE_NAME VARIABLE_VALUE
1735-LOG_SLOW_ADMIN_STATEMENTS ON
1736
1737=== added file 'Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result'
1738--- Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 1970-01-01 00:00:00 +0000
1739+++ Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 2013-05-26 07:24:39 +0000
1740@@ -0,0 +1,6 @@
1741+SHOW VARIABLES LIKE 'log_slow_filter';
1742+Variable_name Value
1743+log_slow_filter full_join
1744+SHOW GLOBAL VARIABLES LIKE 'log_slow_filter';
1745+Variable_name Value
1746+log_slow_filter full_join
1747
1748=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result'
1749--- Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 2012-04-18 23:25:38 +0000
1750+++ Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 1970-01-01 00:00:00 +0000
1751@@ -1,6 +0,0 @@
1752-SHOW VARIABLES LIKE 'log_slow_filter';
1753-Variable_name Value
1754-log_slow_filter full_join
1755-SHOW GLOBAL VARIABLES LIKE 'log_slow_filter';
1756-Variable_name Value
1757-log_slow_filter full_join
1758
1759=== added file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result'
1760--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 1970-01-01 00:00:00 +0000
1761+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 2013-05-26 07:24:39 +0000
1762@@ -0,0 +1,6 @@
1763+SHOW VARIABLES LIKE 'log_slow_slave_statements';
1764+Variable_name Value
1765+log_slow_slave_statements ON
1766+SHOW GLOBAL VARIABLES LIKE 'log_slow_slave_statements';
1767+Variable_name Value
1768+log_slow_slave_statements ON
1769
1770=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result'
1771--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 2012-04-18 23:25:38 +0000
1772+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 1970-01-01 00:00:00 +0000
1773@@ -1,6 +0,0 @@
1774-SHOW VARIABLES LIKE 'log_slow_slave_statements';
1775-Variable_name Value
1776-log_slow_slave_statements ON
1777-SHOW GLOBAL VARIABLES LIKE 'log_slow_slave_statements';
1778-Variable_name Value
1779-log_slow_slave_statements ON
1780
1781=== added file 'Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result'
1782--- Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
1783+++ Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 2013-05-26 07:24:39 +0000
1784@@ -0,0 +1,6 @@
1785+SHOW VARIABLES LIKE 'log_slow_sp_statements';
1786+Variable_name Value
1787+log_slow_sp_statements ON
1788+SHOW GLOBAL VARIABLES LIKE 'log_slow_sp_statements';
1789+Variable_name Value
1790+log_slow_sp_statements ON
1791
1792=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result'
1793--- Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 2012-04-18 23:25:38 +0000
1794+++ Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
1795@@ -1,6 +0,0 @@
1796-SHOW VARIABLES LIKE 'log_slow_sp_statements';
1797-Variable_name Value
1798-log_slow_sp_statements ON
1799-SHOW GLOBAL VARIABLES LIKE 'log_slow_sp_statements';
1800-Variable_name Value
1801-log_slow_sp_statements ON
1802
1803=== added file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result'
1804--- Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
1805+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 2013-05-26 07:24:39 +0000
1806@@ -0,0 +1,6 @@
1807+SHOW VARIABLES LIKE 'log_slow_verbosity';
1808+Variable_name Value
1809+log_slow_verbosity microtime,query_plan,innodb
1810+SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
1811+Variable_name Value
1812+log_slow_verbosity microtime,query_plan,innodb
1813
1814=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result'
1815--- Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 2012-04-18 23:25:38 +0000
1816+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
1817@@ -1,6 +0,0 @@
1818-SHOW VARIABLES LIKE 'log_slow_verbosity';
1819-Variable_name Value
1820-log_slow_verbosity microtime,query_plan,innodb
1821-SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
1822-Variable_name Value
1823-log_slow_verbosity microtime,query_plan,innodb
1824
1825=== added file 'Percona-Server/mysql-test/r/percona_min_examined_row_limit.result'
1826--- Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 1970-01-01 00:00:00 +0000
1827+++ Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 2013-05-26 07:24:39 +0000
1828@@ -0,0 +1,35 @@
1829+drop table if exists t;
1830+create table t(id INT PRIMARY KEY);
1831+insert into t values(1);
1832+insert into t values(2);
1833+insert into t values(3);
1834+SET GLOBAL long_query_time=2;
1835+SET GLOBAL slow_query_log_use_global_control='long_query_time,min_examined_row_limit';
1836+[log_start.inc] percona.slow_extended.min_examined_row_limit
1837+SET SESSION query_exec_time=2.1;
1838+SELECT 1;
1839+1
1840+1
1841+SET GLOBAL min_examined_row_limit=5;
1842+SELECT * FROM t AS t1, t AS t2;
1843+id id
1844+1 1
1845+2 1
1846+3 1
1847+1 2
1848+2 2
1849+3 2
1850+1 3
1851+2 3
1852+3 3
1853+SELECT 1;
1854+1
1855+1
1856+SET SESSION query_exec_time=default;
1857+[log_stop.inc] percona.slow_extended.min_examined_row_limit
1858+SET GLOBAL min_examined_row_limit=default;
1859+SET GLOBAL slow_query_log_use_global_control=default;
1860+SET GLOBAL long_query_time=default;
1861+[log_grep.inc] file: percona.slow_extended.min_examined_row_limit pattern: Query_time
1862+[log_grep.inc] lines: 1
1863+DROP TABLE t;
1864
1865=== removed file 'Percona-Server/mysql-test/r/percona_min_examined_row_limit.result'
1866--- Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 2013-01-20 13:26:51 +0000
1867+++ Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 1970-01-01 00:00:00 +0000
1868@@ -1,35 +0,0 @@
1869-drop table if exists t;
1870-create table t(id INT PRIMARY KEY);
1871-insert into t values(1);
1872-insert into t values(2);
1873-insert into t values(3);
1874-SET GLOBAL long_query_time=2;
1875-SET GLOBAL slow_query_log_use_global_control='long_query_time,min_examined_row_limit';
1876-[log_start.inc] percona.slow_extended.min_examined_row_limit
1877-SET SESSION query_exec_time=2.1;
1878-SELECT 1;
1879-1
1880-1
1881-SET GLOBAL min_examined_row_limit=5;
1882-SELECT * FROM t AS t1, t AS t2;
1883-id id
1884-1 1
1885-2 1
1886-3 1
1887-1 2
1888-2 2
1889-3 2
1890-1 3
1891-2 3
1892-3 3
1893-SELECT 1;
1894-1
1895-1
1896-SET SESSION query_exec_time=default;
1897-[log_stop.inc] percona.slow_extended.min_examined_row_limit
1898-SET GLOBAL min_examined_row_limit=default;
1899-SET GLOBAL slow_query_log_use_global_control=default;
1900-SET GLOBAL long_query_time=default;
1901-[log_grep.inc] file: percona.slow_extended.min_examined_row_limit pattern: Query_time
1902-[log_grep.inc] lines: 1
1903-DROP TABLE t;
1904
1905=== added file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments.result'
1906--- Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 1970-01-01 00:00:00 +0000
1907+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 2013-05-26 07:24:39 +0000
1908@@ -0,0 +1,866 @@
1909+set global query_cache_strip_comments=ON;
1910+set GLOBAL query_cache_size=1355776;
1911+drop table if exists t1;
1912+create table t1 (a int not null);
1913+insert into t1 values (1),(2),(3);
1914+flush query cache;
1915+flush query cache;
1916+reset query cache;
1917+flush status;
1918+flush query cache;
1919+flush query cache;
1920+reset query cache;
1921+flush status;
1922+/* with comment first */select * from t1;
1923+a
1924+1
1925+2
1926+3
1927+-----------------------------------------------------
1928+/* with comment first */select * from t1
1929+-----------------------------------------------------
1930+show status like "Qcache_queries_in_cache";
1931+Variable_name Value
1932+Qcache_queries_in_cache 1
1933+show status like "Qcache_inserts";
1934+Variable_name Value
1935+Qcache_inserts 1
1936+show status like "Qcache_hits";
1937+Variable_name Value
1938+Qcache_hits 0
1939+/* with comment first */select * from t1;
1940+a
1941+1
1942+2
1943+3
1944+/* with comment first */select * from t1;
1945+a
1946+1
1947+2
1948+3
1949+show status like "Qcache_queries_in_cache";
1950+Variable_name Value
1951+Qcache_queries_in_cache 1
1952+show status like "Qcache_inserts";
1953+Variable_name Value
1954+Qcache_inserts 1
1955+show status like "Qcache_hits";
1956+Variable_name Value
1957+Qcache_hits 2
1958+-----------------------------------------------------
1959+# with comment first
1960+select * from t1
1961+-----------------------------------------------------
1962+show status like "Qcache_queries_in_cache";
1963+Variable_name Value
1964+Qcache_queries_in_cache 1
1965+show status like "Qcache_inserts";
1966+Variable_name Value
1967+Qcache_inserts 1
1968+show status like "Qcache_hits";
1969+Variable_name Value
1970+Qcache_hits 2
1971+# with comment first
1972+select * from t1;
1973+a
1974+1
1975+2
1976+3
1977+# with comment first
1978+select * from t1;
1979+a
1980+1
1981+2
1982+3
1983+show status like "Qcache_queries_in_cache";
1984+Variable_name Value
1985+Qcache_queries_in_cache 1
1986+show status like "Qcache_inserts";
1987+Variable_name Value
1988+Qcache_inserts 1
1989+show status like "Qcache_hits";
1990+Variable_name Value
1991+Qcache_hits 4
1992+-----------------------------------------------------
1993+-- with comment first
1994+select * from t1
1995+-----------------------------------------------------
1996+show status like "Qcache_queries_in_cache";
1997+Variable_name Value
1998+Qcache_queries_in_cache 1
1999+show status like "Qcache_inserts";
2000+Variable_name Value
2001+Qcache_inserts 1
2002+show status like "Qcache_hits";
2003+Variable_name Value
2004+Qcache_hits 4
2005+-- with comment first
2006+select * from t1;
2007+a
2008+1
2009+2
2010+3
2011+-- with comment first
2012+select * from t1;
2013+a
2014+1
2015+2
2016+3
2017+show status like "Qcache_queries_in_cache";
2018+Variable_name Value
2019+Qcache_queries_in_cache 1
2020+show status like "Qcache_inserts";
2021+Variable_name Value
2022+Qcache_inserts 1
2023+show status like "Qcache_hits";
2024+Variable_name Value
2025+Qcache_hits 6
2026+-----------------------------------------------------
2027+/* with comment first and "quote" */select * from t1
2028+-----------------------------------------------------
2029+show status like "Qcache_queries_in_cache";
2030+Variable_name Value
2031+Qcache_queries_in_cache 1
2032+show status like "Qcache_inserts";
2033+Variable_name Value
2034+Qcache_inserts 1
2035+show status like "Qcache_hits";
2036+Variable_name Value
2037+Qcache_hits 6
2038+/* with comment first and "quote" */select * from t1;
2039+a
2040+1
2041+2
2042+3
2043+/* with comment first and "quote" */select * from t1;
2044+a
2045+1
2046+2
2047+3
2048+show status like "Qcache_queries_in_cache";
2049+Variable_name Value
2050+Qcache_queries_in_cache 1
2051+show status like "Qcache_inserts";
2052+Variable_name Value
2053+Qcache_inserts 1
2054+show status like "Qcache_hits";
2055+Variable_name Value
2056+Qcache_hits 8
2057+-----------------------------------------------------
2058+# with comment first and "quote"
2059+select * from t1
2060+-----------------------------------------------------
2061+show status like "Qcache_queries_in_cache";
2062+Variable_name Value
2063+Qcache_queries_in_cache 1
2064+show status like "Qcache_inserts";
2065+Variable_name Value
2066+Qcache_inserts 1
2067+show status like "Qcache_hits";
2068+Variable_name Value
2069+Qcache_hits 8
2070+# with comment first and "quote"
2071+select * from t1;
2072+a
2073+1
2074+2
2075+3
2076+# with comment first and "quote"
2077+select * from t1;
2078+a
2079+1
2080+2
2081+3
2082+show status like "Qcache_queries_in_cache";
2083+Variable_name Value
2084+Qcache_queries_in_cache 1
2085+show status like "Qcache_inserts";
2086+Variable_name Value
2087+Qcache_inserts 1
2088+show status like "Qcache_hits";
2089+Variable_name Value
2090+Qcache_hits 10
2091+-----------------------------------------------------
2092+-- with comment first and "quote"
2093+select * from t1
2094+-----------------------------------------------------
2095+show status like "Qcache_queries_in_cache";
2096+Variable_name Value
2097+Qcache_queries_in_cache 1
2098+show status like "Qcache_inserts";
2099+Variable_name Value
2100+Qcache_inserts 1
2101+show status like "Qcache_hits";
2102+Variable_name Value
2103+Qcache_hits 10
2104+-- with comment first and "quote"
2105+select * from t1;
2106+a
2107+1
2108+2
2109+3
2110+-- with comment first and "quote"
2111+select * from t1;
2112+a
2113+1
2114+2
2115+3
2116+show status like "Qcache_queries_in_cache";
2117+Variable_name Value
2118+Qcache_queries_in_cache 1
2119+show status like "Qcache_inserts";
2120+Variable_name Value
2121+Qcache_inserts 1
2122+show status like "Qcache_hits";
2123+Variable_name Value
2124+Qcache_hits 12
2125+-----------------------------------------------------
2126+/* with comment and whitespaces first */select * from t1
2127+-----------------------------------------------------
2128+show status like "Qcache_queries_in_cache";
2129+Variable_name Value
2130+Qcache_queries_in_cache 1
2131+show status like "Qcache_inserts";
2132+Variable_name Value
2133+Qcache_inserts 1
2134+show status like "Qcache_hits";
2135+Variable_name Value
2136+Qcache_hits 12
2137+/* with comment and whitespaces first */select * from t1;
2138+a
2139+1
2140+2
2141+3
2142+/* with comment and whitespaces first */select * from t1;
2143+a
2144+1
2145+2
2146+3
2147+show status like "Qcache_queries_in_cache";
2148+Variable_name Value
2149+Qcache_queries_in_cache 1
2150+show status like "Qcache_inserts";
2151+Variable_name Value
2152+Qcache_inserts 1
2153+show status like "Qcache_hits";
2154+Variable_name Value
2155+Qcache_hits 14
2156+-----------------------------------------------------
2157+# with comment and whitespaces first
2158+select * from t1
2159+-----------------------------------------------------
2160+show status like "Qcache_queries_in_cache";
2161+Variable_name Value
2162+Qcache_queries_in_cache 1
2163+show status like "Qcache_inserts";
2164+Variable_name Value
2165+Qcache_inserts 1
2166+show status like "Qcache_hits";
2167+Variable_name Value
2168+Qcache_hits 14
2169+# with comment and whitespaces first
2170+select * from t1;
2171+a
2172+1
2173+2
2174+3
2175+# with comment and whitespaces first
2176+select * from t1;
2177+a
2178+1
2179+2
2180+3
2181+show status like "Qcache_queries_in_cache";
2182+Variable_name Value
2183+Qcache_queries_in_cache 1
2184+show status like "Qcache_inserts";
2185+Variable_name Value
2186+Qcache_inserts 1
2187+show status like "Qcache_hits";
2188+Variable_name Value
2189+Qcache_hits 16
2190+-----------------------------------------------------
2191+-- with comment and whitespaces first
2192+select * from t1
2193+-----------------------------------------------------
2194+show status like "Qcache_queries_in_cache";
2195+Variable_name Value
2196+Qcache_queries_in_cache 1
2197+show status like "Qcache_inserts";
2198+Variable_name Value
2199+Qcache_inserts 1
2200+show status like "Qcache_hits";
2201+Variable_name Value
2202+Qcache_hits 16
2203+-- with comment and whitespaces first
2204+select * from t1;
2205+a
2206+1
2207+2
2208+3
2209+-- with comment and whitespaces first
2210+select * from t1;
2211+a
2212+1
2213+2
2214+3
2215+show status like "Qcache_queries_in_cache";
2216+Variable_name Value
2217+Qcache_queries_in_cache 1
2218+show status like "Qcache_inserts";
2219+Variable_name Value
2220+Qcache_inserts 1
2221+show status like "Qcache_hits";
2222+Variable_name Value
2223+Qcache_hits 18
2224+-----------------------------------------------------
2225+select * /* internal comment */ from t1
2226+-----------------------------------------------------
2227+show status like "Qcache_queries_in_cache";
2228+Variable_name Value
2229+Qcache_queries_in_cache 1
2230+show status like "Qcache_inserts";
2231+Variable_name Value
2232+Qcache_inserts 1
2233+show status like "Qcache_hits";
2234+Variable_name Value
2235+Qcache_hits 18
2236+select * /* internal comment */ from t1;
2237+a
2238+1
2239+2
2240+3
2241+select * /* internal comment */ from t1;
2242+a
2243+1
2244+2
2245+3
2246+show status like "Qcache_queries_in_cache";
2247+Variable_name Value
2248+Qcache_queries_in_cache 1
2249+show status like "Qcache_inserts";
2250+Variable_name Value
2251+Qcache_inserts 1
2252+show status like "Qcache_hits";
2253+Variable_name Value
2254+Qcache_hits 20
2255+-----------------------------------------------------
2256+select */* internal comment */ from t1
2257+-----------------------------------------------------
2258+show status like "Qcache_queries_in_cache";
2259+Variable_name Value
2260+Qcache_queries_in_cache 1
2261+show status like "Qcache_inserts";
2262+Variable_name Value
2263+Qcache_inserts 1
2264+show status like "Qcache_hits";
2265+Variable_name Value
2266+Qcache_hits 20
2267+select */* internal comment */ from t1;
2268+a
2269+1
2270+2
2271+3
2272+select */* internal comment */ from t1;
2273+a
2274+1
2275+2
2276+3
2277+show status like "Qcache_queries_in_cache";
2278+Variable_name Value
2279+Qcache_queries_in_cache 1
2280+show status like "Qcache_inserts";
2281+Variable_name Value
2282+Qcache_inserts 1
2283+show status like "Qcache_hits";
2284+Variable_name Value
2285+Qcache_hits 22
2286+-----------------------------------------------------
2287+select */* internal comment */from t1
2288+-----------------------------------------------------
2289+show status like "Qcache_queries_in_cache";
2290+Variable_name Value
2291+Qcache_queries_in_cache 1
2292+show status like "Qcache_inserts";
2293+Variable_name Value
2294+Qcache_inserts 1
2295+show status like "Qcache_hits";
2296+Variable_name Value
2297+Qcache_hits 22
2298+select */* internal comment */from t1;
2299+a
2300+1
2301+2
2302+3
2303+select */* internal comment */from t1;
2304+a
2305+1
2306+2
2307+3
2308+show status like "Qcache_queries_in_cache";
2309+Variable_name Value
2310+Qcache_queries_in_cache 1
2311+show status like "Qcache_inserts";
2312+Variable_name Value
2313+Qcache_inserts 1
2314+show status like "Qcache_hits";
2315+Variable_name Value
2316+Qcache_hits 24
2317+-----------------------------------------------------
2318+select * /* internal comment with "quote" */ from t1
2319+-----------------------------------------------------
2320+show status like "Qcache_queries_in_cache";
2321+Variable_name Value
2322+Qcache_queries_in_cache 1
2323+show status like "Qcache_inserts";
2324+Variable_name Value
2325+Qcache_inserts 1
2326+show status like "Qcache_hits";
2327+Variable_name Value
2328+Qcache_hits 24
2329+select * /* internal comment with "quote" */ from t1;
2330+a
2331+1
2332+2
2333+3
2334+select * /* internal comment with "quote" */ from t1;
2335+a
2336+1
2337+2
2338+3
2339+show status like "Qcache_queries_in_cache";
2340+Variable_name Value
2341+Qcache_queries_in_cache 1
2342+show status like "Qcache_inserts";
2343+Variable_name Value
2344+Qcache_inserts 1
2345+show status like "Qcache_hits";
2346+Variable_name Value
2347+Qcache_hits 26
2348+-----------------------------------------------------
2349+select */* internal comment with "quote" */ from t1
2350+-----------------------------------------------------
2351+show status like "Qcache_queries_in_cache";
2352+Variable_name Value
2353+Qcache_queries_in_cache 1
2354+show status like "Qcache_inserts";
2355+Variable_name Value
2356+Qcache_inserts 1
2357+show status like "Qcache_hits";
2358+Variable_name Value
2359+Qcache_hits 26
2360+select */* internal comment with "quote" */ from t1;
2361+a
2362+1
2363+2
2364+3
2365+select */* internal comment with "quote" */ from t1;
2366+a
2367+1
2368+2
2369+3
2370+show status like "Qcache_queries_in_cache";
2371+Variable_name Value
2372+Qcache_queries_in_cache 1
2373+show status like "Qcache_inserts";
2374+Variable_name Value
2375+Qcache_inserts 1
2376+show status like "Qcache_hits";
2377+Variable_name Value
2378+Qcache_hits 28
2379+-----------------------------------------------------
2380+select */* internal comment with "quote" */from t1
2381+-----------------------------------------------------
2382+show status like "Qcache_queries_in_cache";
2383+Variable_name Value
2384+Qcache_queries_in_cache 1
2385+show status like "Qcache_inserts";
2386+Variable_name Value
2387+Qcache_inserts 1
2388+show status like "Qcache_hits";
2389+Variable_name Value
2390+Qcache_hits 28
2391+select */* internal comment with "quote" */from t1;
2392+a
2393+1
2394+2
2395+3
2396+select */* internal comment with "quote" */from t1;
2397+a
2398+1
2399+2
2400+3
2401+show status like "Qcache_queries_in_cache";
2402+Variable_name Value
2403+Qcache_queries_in_cache 1
2404+show status like "Qcache_inserts";
2405+Variable_name Value
2406+Qcache_inserts 1
2407+show status like "Qcache_hits";
2408+Variable_name Value
2409+Qcache_hits 30
2410+-----------------------------------------------------
2411+select * from t1
2412+
2413+-----------------------------------------------------
2414+show status like "Qcache_queries_in_cache";
2415+Variable_name Value
2416+Qcache_queries_in_cache 1
2417+show status like "Qcache_inserts";
2418+Variable_name Value
2419+Qcache_inserts 1
2420+show status like "Qcache_hits";
2421+Variable_name Value
2422+Qcache_hits 30
2423+select * from t1
2424+;
2425+a
2426+1
2427+2
2428+3
2429+select * from t1
2430+;
2431+a
2432+1
2433+2
2434+3
2435+show status like "Qcache_queries_in_cache";
2436+Variable_name Value
2437+Qcache_queries_in_cache 1
2438+show status like "Qcache_inserts";
2439+Variable_name Value
2440+Qcache_inserts 1
2441+show status like "Qcache_hits";
2442+Variable_name Value
2443+Qcache_hits 32
2444+-----------------------------------------------------
2445+select * from t1
2446+-----------------------------------------------------
2447+show status like "Qcache_queries_in_cache";
2448+Variable_name Value
2449+Qcache_queries_in_cache 1
2450+show status like "Qcache_inserts";
2451+Variable_name Value
2452+Qcache_inserts 1
2453+show status like "Qcache_hits";
2454+Variable_name Value
2455+Qcache_hits 32
2456+select * from t1 ;
2457+a
2458+1
2459+2
2460+3
2461+select * from t1 ;
2462+a
2463+1
2464+2
2465+3
2466+show status like "Qcache_queries_in_cache";
2467+Variable_name Value
2468+Qcache_queries_in_cache 1
2469+show status like "Qcache_inserts";
2470+Variable_name Value
2471+Qcache_inserts 1
2472+show status like "Qcache_hits";
2473+Variable_name Value
2474+Qcache_hits 34
2475+-----------------------------------------------------
2476+select * from t1
2477+-----------------------------------------------------
2478+show status like "Qcache_queries_in_cache";
2479+Variable_name Value
2480+Qcache_queries_in_cache 1
2481+show status like "Qcache_inserts";
2482+Variable_name Value
2483+Qcache_inserts 1
2484+show status like "Qcache_hits";
2485+Variable_name Value
2486+Qcache_hits 34
2487+select * from t1 ;
2488+a
2489+1
2490+2
2491+3
2492+select * from t1 ;
2493+a
2494+1
2495+2
2496+3
2497+show status like "Qcache_queries_in_cache";
2498+Variable_name Value
2499+Qcache_queries_in_cache 1
2500+show status like "Qcache_inserts";
2501+Variable_name Value
2502+Qcache_inserts 1
2503+show status like "Qcache_hits";
2504+Variable_name Value
2505+Qcache_hits 36
2506+-----------------------------------------------------
2507+select * from t1
2508+/* comment in the end */
2509+-----------------------------------------------------
2510+show status like "Qcache_queries_in_cache";
2511+Variable_name Value
2512+Qcache_queries_in_cache 1
2513+show status like "Qcache_inserts";
2514+Variable_name Value
2515+Qcache_inserts 1
2516+show status like "Qcache_hits";
2517+Variable_name Value
2518+Qcache_hits 36
2519+select * from t1
2520+/* comment in the end */;
2521+a
2522+1
2523+2
2524+3
2525+select * from t1
2526+/* comment in the end */;
2527+a
2528+1
2529+2
2530+3
2531+show status like "Qcache_queries_in_cache";
2532+Variable_name Value
2533+Qcache_queries_in_cache 1
2534+show status like "Qcache_inserts";
2535+Variable_name Value
2536+Qcache_inserts 1
2537+show status like "Qcache_hits";
2538+Variable_name Value
2539+Qcache_hits 38
2540+-----------------------------------------------------
2541+select * from t1
2542+/* *\/ */
2543+-----------------------------------------------------
2544+show status like "Qcache_queries_in_cache";
2545+Variable_name Value
2546+Qcache_queries_in_cache 1
2547+show status like "Qcache_inserts";
2548+Variable_name Value
2549+Qcache_inserts 1
2550+show status like "Qcache_hits";
2551+Variable_name Value
2552+Qcache_hits 38
2553+select * from t1
2554+/* *\/ */;
2555+a
2556+1
2557+2
2558+3
2559+select * from t1
2560+/* *\/ */;
2561+a
2562+1
2563+2
2564+3
2565+show status like "Qcache_queries_in_cache";
2566+Variable_name Value
2567+Qcache_queries_in_cache 1
2568+show status like "Qcache_inserts";
2569+Variable_name Value
2570+Qcache_inserts 1
2571+show status like "Qcache_hits";
2572+Variable_name Value
2573+Qcache_hits 40
2574+-----------------------------------------------------
2575+select * from t1
2576+/* comment in the end */
2577+
2578+-----------------------------------------------------
2579+show status like "Qcache_queries_in_cache";
2580+Variable_name Value
2581+Qcache_queries_in_cache 1
2582+show status like "Qcache_inserts";
2583+Variable_name Value
2584+Qcache_inserts 1
2585+show status like "Qcache_hits";
2586+Variable_name Value
2587+Qcache_hits 40
2588+select * from t1
2589+/* comment in the end */
2590+;
2591+a
2592+1
2593+2
2594+3
2595+select * from t1
2596+/* comment in the end */
2597+;
2598+a
2599+1
2600+2
2601+3
2602+show status like "Qcache_queries_in_cache";
2603+Variable_name Value
2604+Qcache_queries_in_cache 1
2605+show status like "Qcache_inserts";
2606+Variable_name Value
2607+Qcache_inserts 1
2608+show status like "Qcache_hits";
2609+Variable_name Value
2610+Qcache_hits 42
2611+-----------------------------------------------------
2612+select * from t1 #comment in the end
2613+-----------------------------------------------------
2614+show status like "Qcache_queries_in_cache";
2615+Variable_name Value
2616+Qcache_queries_in_cache 1
2617+show status like "Qcache_inserts";
2618+Variable_name Value
2619+Qcache_inserts 1
2620+show status like "Qcache_hits";
2621+Variable_name Value
2622+Qcache_hits 42
2623+select * from t1 #comment in the end;
2624+a
2625+1
2626+2
2627+3
2628+select * from t1 #comment in the end;
2629+a
2630+1
2631+2
2632+3
2633+show status like "Qcache_queries_in_cache";
2634+Variable_name Value
2635+Qcache_queries_in_cache 1
2636+show status like "Qcache_inserts";
2637+Variable_name Value
2638+Qcache_inserts 1
2639+show status like "Qcache_hits";
2640+Variable_name Value
2641+Qcache_hits 44
2642+-----------------------------------------------------
2643+select * from t1 #comment in the end
2644+
2645+-----------------------------------------------------
2646+show status like "Qcache_queries_in_cache";
2647+Variable_name Value
2648+Qcache_queries_in_cache 1
2649+show status like "Qcache_inserts";
2650+Variable_name Value
2651+Qcache_inserts 1
2652+show status like "Qcache_hits";
2653+Variable_name Value
2654+Qcache_hits 44
2655+select * from t1 #comment in the end
2656+;
2657+a
2658+1
2659+2
2660+3
2661+select * from t1 #comment in the end
2662+;
2663+a
2664+1
2665+2
2666+3
2667+show status like "Qcache_queries_in_cache";
2668+Variable_name Value
2669+Qcache_queries_in_cache 1
2670+show status like "Qcache_inserts";
2671+Variable_name Value
2672+Qcache_inserts 1
2673+show status like "Qcache_hits";
2674+Variable_name Value
2675+Qcache_hits 46
2676+-----------------------------------------------------
2677+select * from t1 -- comment in the end
2678+-----------------------------------------------------
2679+show status like "Qcache_queries_in_cache";
2680+Variable_name Value
2681+Qcache_queries_in_cache 1
2682+show status like "Qcache_inserts";
2683+Variable_name Value
2684+Qcache_inserts 1
2685+show status like "Qcache_hits";
2686+Variable_name Value
2687+Qcache_hits 46
2688+select * from t1 -- comment in the end;
2689+a
2690+1
2691+2
2692+3
2693+select * from t1 -- comment in the end;
2694+a
2695+1
2696+2
2697+3
2698+show status like "Qcache_queries_in_cache";
2699+Variable_name Value
2700+Qcache_queries_in_cache 1
2701+show status like "Qcache_inserts";
2702+Variable_name Value
2703+Qcache_inserts 1
2704+show status like "Qcache_hits";
2705+Variable_name Value
2706+Qcache_hits 48
2707+-----------------------------------------------------
2708+select * from t1 -- comment in the end
2709+
2710+-----------------------------------------------------
2711+show status like "Qcache_queries_in_cache";
2712+Variable_name Value
2713+Qcache_queries_in_cache 1
2714+show status like "Qcache_inserts";
2715+Variable_name Value
2716+Qcache_inserts 1
2717+show status like "Qcache_hits";
2718+Variable_name Value
2719+Qcache_hits 48
2720+select * from t1 -- comment in the end
2721+;
2722+a
2723+1
2724+2
2725+3
2726+select * from t1 -- comment in the end
2727+;
2728+a
2729+1
2730+2
2731+3
2732+show status like "Qcache_queries_in_cache";
2733+Variable_name Value
2734+Qcache_queries_in_cache 1
2735+show status like "Qcache_inserts";
2736+Variable_name Value
2737+Qcache_inserts 1
2738+show status like "Qcache_hits";
2739+Variable_name Value
2740+Qcache_hits 50
2741+-----------------------------------------------------
2742+select ' \' ' from t1
2743+-----------------------------------------------------
2744+show status like "Qcache_queries_in_cache";
2745+Variable_name Value
2746+Qcache_queries_in_cache 1
2747+show status like "Qcache_inserts";
2748+Variable_name Value
2749+Qcache_inserts 1
2750+show status like "Qcache_hits";
2751+Variable_name Value
2752+Qcache_hits 50
2753+select ' \' ' from t1;
2754+'
2755+ '
2756+ '
2757+ '
2758+select ' \' ' from t1;
2759+'
2760+ '
2761+ '
2762+ '
2763+show status like "Qcache_queries_in_cache";
2764+Variable_name Value
2765+Qcache_queries_in_cache 2
2766+show status like "Qcache_inserts";
2767+Variable_name Value
2768+Qcache_inserts 2
2769+show status like "Qcache_hits";
2770+Variable_name Value
2771+Qcache_hits 51
2772+DROP TABLE t1;
2773+SET GLOBAL query_cache_size=default;
2774+set global query_cache_strip_comments=OFF;
2775
2776=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments.result'
2777--- Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 2012-04-18 23:25:43 +0000
2778+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 1970-01-01 00:00:00 +0000
2779@@ -1,866 +0,0 @@
2780-set global query_cache_strip_comments=ON;
2781-set GLOBAL query_cache_size=1355776;
2782-drop table if exists t1;
2783-create table t1 (a int not null);
2784-insert into t1 values (1),(2),(3);
2785-flush query cache;
2786-flush query cache;
2787-reset query cache;
2788-flush status;
2789-flush query cache;
2790-flush query cache;
2791-reset query cache;
2792-flush status;
2793-/* with comment first */select * from t1;
2794-a
2795-1
2796-2
2797-3
2798------------------------------------------------------
2799-/* with comment first */select * from t1
2800------------------------------------------------------
2801-show status like "Qcache_queries_in_cache";
2802-Variable_name Value
2803-Qcache_queries_in_cache 1
2804-show status like "Qcache_inserts";
2805-Variable_name Value
2806-Qcache_inserts 1
2807-show status like "Qcache_hits";
2808-Variable_name Value
2809-Qcache_hits 0
2810-/* with comment first */select * from t1;
2811-a
2812-1
2813-2
2814-3
2815-/* with comment first */select * from t1;
2816-a
2817-1
2818-2
2819-3
2820-show status like "Qcache_queries_in_cache";
2821-Variable_name Value
2822-Qcache_queries_in_cache 1
2823-show status like "Qcache_inserts";
2824-Variable_name Value
2825-Qcache_inserts 1
2826-show status like "Qcache_hits";
2827-Variable_name Value
2828-Qcache_hits 2
2829------------------------------------------------------
2830-# with comment first
2831-select * from t1
2832------------------------------------------------------
2833-show status like "Qcache_queries_in_cache";
2834-Variable_name Value
2835-Qcache_queries_in_cache 1
2836-show status like "Qcache_inserts";
2837-Variable_name Value
2838-Qcache_inserts 1
2839-show status like "Qcache_hits";
2840-Variable_name Value
2841-Qcache_hits 2
2842-# with comment first
2843-select * from t1;
2844-a
2845-1
2846-2
2847-3
2848-# with comment first
2849-select * from t1;
2850-a
2851-1
2852-2
2853-3
2854-show status like "Qcache_queries_in_cache";
2855-Variable_name Value
2856-Qcache_queries_in_cache 1
2857-show status like "Qcache_inserts";
2858-Variable_name Value
2859-Qcache_inserts 1
2860-show status like "Qcache_hits";
2861-Variable_name Value
2862-Qcache_hits 4
2863------------------------------------------------------
2864--- with comment first
2865-select * from t1
2866------------------------------------------------------
2867-show status like "Qcache_queries_in_cache";
2868-Variable_name Value
2869-Qcache_queries_in_cache 1
2870-show status like "Qcache_inserts";
2871-Variable_name Value
2872-Qcache_inserts 1
2873-show status like "Qcache_hits";
2874-Variable_name Value
2875-Qcache_hits 4
2876--- with comment first
2877-select * from t1;
2878-a
2879-1
2880-2
2881-3
2882--- with comment first
2883-select * from t1;
2884-a
2885-1
2886-2
2887-3
2888-show status like "Qcache_queries_in_cache";
2889-Variable_name Value
2890-Qcache_queries_in_cache 1
2891-show status like "Qcache_inserts";
2892-Variable_name Value
2893-Qcache_inserts 1
2894-show status like "Qcache_hits";
2895-Variable_name Value
2896-Qcache_hits 6
2897------------------------------------------------------
2898-/* with comment first and "quote" */select * from t1
2899------------------------------------------------------
2900-show status like "Qcache_queries_in_cache";
2901-Variable_name Value
2902-Qcache_queries_in_cache 1
2903-show status like "Qcache_inserts";
2904-Variable_name Value
2905-Qcache_inserts 1
2906-show status like "Qcache_hits";
2907-Variable_name Value
2908-Qcache_hits 6
2909-/* with comment first and "quote" */select * from t1;
2910-a
2911-1
2912-2
2913-3
2914-/* with comment first and "quote" */select * from t1;
2915-a
2916-1
2917-2
2918-3
2919-show status like "Qcache_queries_in_cache";
2920-Variable_name Value
2921-Qcache_queries_in_cache 1
2922-show status like "Qcache_inserts";
2923-Variable_name Value
2924-Qcache_inserts 1
2925-show status like "Qcache_hits";
2926-Variable_name Value
2927-Qcache_hits 8
2928------------------------------------------------------
2929-# with comment first and "quote"
2930-select * from t1
2931------------------------------------------------------
2932-show status like "Qcache_queries_in_cache";
2933-Variable_name Value
2934-Qcache_queries_in_cache 1
2935-show status like "Qcache_inserts";
2936-Variable_name Value
2937-Qcache_inserts 1
2938-show status like "Qcache_hits";
2939-Variable_name Value
2940-Qcache_hits 8
2941-# with comment first and "quote"
2942-select * from t1;
2943-a
2944-1
2945-2
2946-3
2947-# with comment first and "quote"
2948-select * from t1;
2949-a
2950-1
2951-2
2952-3
2953-show status like "Qcache_queries_in_cache";
2954-Variable_name Value
2955-Qcache_queries_in_cache 1
2956-show status like "Qcache_inserts";
2957-Variable_name Value
2958-Qcache_inserts 1
2959-show status like "Qcache_hits";
2960-Variable_name Value
2961-Qcache_hits 10
2962------------------------------------------------------
2963--- with comment first and "quote"
2964-select * from t1
2965------------------------------------------------------
2966-show status like "Qcache_queries_in_cache";
2967-Variable_name Value
2968-Qcache_queries_in_cache 1
2969-show status like "Qcache_inserts";
2970-Variable_name Value
2971-Qcache_inserts 1
2972-show status like "Qcache_hits";
2973-Variable_name Value
2974-Qcache_hits 10
2975--- with comment first and "quote"
2976-select * from t1;
2977-a
2978-1
2979-2
2980-3
2981--- with comment first and "quote"
2982-select * from t1;
2983-a
2984-1
2985-2
2986-3
2987-show status like "Qcache_queries_in_cache";
2988-Variable_name Value
2989-Qcache_queries_in_cache 1
2990-show status like "Qcache_inserts";
2991-Variable_name Value
2992-Qcache_inserts 1
2993-show status like "Qcache_hits";
2994-Variable_name Value
2995-Qcache_hits 12
2996------------------------------------------------------
2997-/* with comment and whitespaces first */select * from t1
2998------------------------------------------------------
2999-show status like "Qcache_queries_in_cache";
3000-Variable_name Value
3001-Qcache_queries_in_cache 1
3002-show status like "Qcache_inserts";
3003-Variable_name Value
3004-Qcache_inserts 1
3005-show status like "Qcache_hits";
3006-Variable_name Value
3007-Qcache_hits 12
3008-/* with comment and whitespaces first */select * from t1;
3009-a
3010-1
3011-2
3012-3
3013-/* with comment and whitespaces first */select * from t1;
3014-a
3015-1
3016-2
3017-3
3018-show status like "Qcache_queries_in_cache";
3019-Variable_name Value
3020-Qcache_queries_in_cache 1
3021-show status like "Qcache_inserts";
3022-Variable_name Value
3023-Qcache_inserts 1
3024-show status like "Qcache_hits";
3025-Variable_name Value
3026-Qcache_hits 14
3027------------------------------------------------------
3028-# with comment and whitespaces first
3029-select * from t1
3030------------------------------------------------------
3031-show status like "Qcache_queries_in_cache";
3032-Variable_name Value
3033-Qcache_queries_in_cache 1
3034-show status like "Qcache_inserts";
3035-Variable_name Value
3036-Qcache_inserts 1
3037-show status like "Qcache_hits";
3038-Variable_name Value
3039-Qcache_hits 14
3040-# with comment and whitespaces first
3041-select * from t1;
3042-a
3043-1
3044-2
3045-3
3046-# with comment and whitespaces first
3047-select * from t1;
3048-a
3049-1
3050-2
3051-3
3052-show status like "Qcache_queries_in_cache";
3053-Variable_name Value
3054-Qcache_queries_in_cache 1
3055-show status like "Qcache_inserts";
3056-Variable_name Value
3057-Qcache_inserts 1
3058-show status like "Qcache_hits";
3059-Variable_name Value
3060-Qcache_hits 16
3061------------------------------------------------------
3062--- with comment and whitespaces first
3063-select * from t1
3064------------------------------------------------------
3065-show status like "Qcache_queries_in_cache";
3066-Variable_name Value
3067-Qcache_queries_in_cache 1
3068-show status like "Qcache_inserts";
3069-Variable_name Value
3070-Qcache_inserts 1
3071-show status like "Qcache_hits";
3072-Variable_name Value
3073-Qcache_hits 16
3074--- with comment and whitespaces first
3075-select * from t1;
3076-a
3077-1
3078-2
3079-3
3080--- with comment and whitespaces first
3081-select * from t1;
3082-a
3083-1
3084-2
3085-3
3086-show status like "Qcache_queries_in_cache";
3087-Variable_name Value
3088-Qcache_queries_in_cache 1
3089-show status like "Qcache_inserts";
3090-Variable_name Value
3091-Qcache_inserts 1
3092-show status like "Qcache_hits";
3093-Variable_name Value
3094-Qcache_hits 18
3095------------------------------------------------------
3096-select * /* internal comment */ from t1
3097------------------------------------------------------
3098-show status like "Qcache_queries_in_cache";
3099-Variable_name Value
3100-Qcache_queries_in_cache 1
3101-show status like "Qcache_inserts";
3102-Variable_name Value
3103-Qcache_inserts 1
3104-show status like "Qcache_hits";
3105-Variable_name Value
3106-Qcache_hits 18
3107-select * /* internal comment */ from t1;
3108-a
3109-1
3110-2
3111-3
3112-select * /* internal comment */ from t1;
3113-a
3114-1
3115-2
3116-3
3117-show status like "Qcache_queries_in_cache";
3118-Variable_name Value
3119-Qcache_queries_in_cache 1
3120-show status like "Qcache_inserts";
3121-Variable_name Value
3122-Qcache_inserts 1
3123-show status like "Qcache_hits";
3124-Variable_name Value
3125-Qcache_hits 20
3126------------------------------------------------------
3127-select */* internal comment */ from t1
3128------------------------------------------------------
3129-show status like "Qcache_queries_in_cache";
3130-Variable_name Value
3131-Qcache_queries_in_cache 1
3132-show status like "Qcache_inserts";
3133-Variable_name Value
3134-Qcache_inserts 1
3135-show status like "Qcache_hits";
3136-Variable_name Value
3137-Qcache_hits 20
3138-select */* internal comment */ from t1;
3139-a
3140-1
3141-2
3142-3
3143-select */* internal comment */ from t1;
3144-a
3145-1
3146-2
3147-3
3148-show status like "Qcache_queries_in_cache";
3149-Variable_name Value
3150-Qcache_queries_in_cache 1
3151-show status like "Qcache_inserts";
3152-Variable_name Value
3153-Qcache_inserts 1
3154-show status like "Qcache_hits";
3155-Variable_name Value
3156-Qcache_hits 22
3157------------------------------------------------------
3158-select */* internal comment */from t1
3159------------------------------------------------------
3160-show status like "Qcache_queries_in_cache";
3161-Variable_name Value
3162-Qcache_queries_in_cache 1
3163-show status like "Qcache_inserts";
3164-Variable_name Value
3165-Qcache_inserts 1
3166-show status like "Qcache_hits";
3167-Variable_name Value
3168-Qcache_hits 22
3169-select */* internal comment */from t1;
3170-a
3171-1
3172-2
3173-3
3174-select */* internal comment */from t1;
3175-a
3176-1
3177-2
3178-3
3179-show status like "Qcache_queries_in_cache";
3180-Variable_name Value
3181-Qcache_queries_in_cache 1
3182-show status like "Qcache_inserts";
3183-Variable_name Value
3184-Qcache_inserts 1
3185-show status like "Qcache_hits";
3186-Variable_name Value
3187-Qcache_hits 24
3188------------------------------------------------------
3189-select * /* internal comment with "quote" */ from t1
3190------------------------------------------------------
3191-show status like "Qcache_queries_in_cache";
3192-Variable_name Value
3193-Qcache_queries_in_cache 1
3194-show status like "Qcache_inserts";
3195-Variable_name Value
3196-Qcache_inserts 1
3197-show status like "Qcache_hits";
3198-Variable_name Value
3199-Qcache_hits 24
3200-select * /* internal comment with "quote" */ from t1;
3201-a
3202-1
3203-2
3204-3
3205-select * /* internal comment with "quote" */ from t1;
3206-a
3207-1
3208-2
3209-3
3210-show status like "Qcache_queries_in_cache";
3211-Variable_name Value
3212-Qcache_queries_in_cache 1
3213-show status like "Qcache_inserts";
3214-Variable_name Value
3215-Qcache_inserts 1
3216-show status like "Qcache_hits";
3217-Variable_name Value
3218-Qcache_hits 26
3219------------------------------------------------------
3220-select */* internal comment with "quote" */ from t1
3221------------------------------------------------------
3222-show status like "Qcache_queries_in_cache";
3223-Variable_name Value
3224-Qcache_queries_in_cache 1
3225-show status like "Qcache_inserts";
3226-Variable_name Value
3227-Qcache_inserts 1
3228-show status like "Qcache_hits";
3229-Variable_name Value
3230-Qcache_hits 26
3231-select */* internal comment with "quote" */ from t1;
3232-a
3233-1
3234-2
3235-3
3236-select */* internal comment with "quote" */ from t1;
3237-a
3238-1
3239-2
3240-3
3241-show status like "Qcache_queries_in_cache";
3242-Variable_name Value
3243-Qcache_queries_in_cache 1
3244-show status like "Qcache_inserts";
3245-Variable_name Value
3246-Qcache_inserts 1
3247-show status like "Qcache_hits";
3248-Variable_name Value
3249-Qcache_hits 28
3250------------------------------------------------------
3251-select */* internal comment with "quote" */from t1
3252------------------------------------------------------
3253-show status like "Qcache_queries_in_cache";
3254-Variable_name Value
3255-Qcache_queries_in_cache 1
3256-show status like "Qcache_inserts";
3257-Variable_name Value
3258-Qcache_inserts 1
3259-show status like "Qcache_hits";
3260-Variable_name Value
3261-Qcache_hits 28
3262-select */* internal comment with "quote" */from t1;
3263-a
3264-1
3265-2
3266-3
3267-select */* internal comment with "quote" */from t1;
3268-a
3269-1
3270-2
3271-3
3272-show status like "Qcache_queries_in_cache";
3273-Variable_name Value
3274-Qcache_queries_in_cache 1
3275-show status like "Qcache_inserts";
3276-Variable_name Value
3277-Qcache_inserts 1
3278-show status like "Qcache_hits";
3279-Variable_name Value
3280-Qcache_hits 30
3281------------------------------------------------------
3282-select * from t1
3283-
3284------------------------------------------------------
3285-show status like "Qcache_queries_in_cache";
3286-Variable_name Value
3287-Qcache_queries_in_cache 1
3288-show status like "Qcache_inserts";
3289-Variable_name Value
3290-Qcache_inserts 1
3291-show status like "Qcache_hits";
3292-Variable_name Value
3293-Qcache_hits 30
3294-select * from t1
3295-;
3296-a
3297-1
3298-2
3299-3
3300-select * from t1
3301-;
3302-a
3303-1
3304-2
3305-3
3306-show status like "Qcache_queries_in_cache";
3307-Variable_name Value
3308-Qcache_queries_in_cache 1
3309-show status like "Qcache_inserts";
3310-Variable_name Value
3311-Qcache_inserts 1
3312-show status like "Qcache_hits";
3313-Variable_name Value
3314-Qcache_hits 32
3315------------------------------------------------------
3316-select * from t1
3317------------------------------------------------------
3318-show status like "Qcache_queries_in_cache";
3319-Variable_name Value
3320-Qcache_queries_in_cache 1
3321-show status like "Qcache_inserts";
3322-Variable_name Value
3323-Qcache_inserts 1
3324-show status like "Qcache_hits";
3325-Variable_name Value
3326-Qcache_hits 32
3327-select * from t1 ;
3328-a
3329-1
3330-2
3331-3
3332-select * from t1 ;
3333-a
3334-1
3335-2
3336-3
3337-show status like "Qcache_queries_in_cache";
3338-Variable_name Value
3339-Qcache_queries_in_cache 1
3340-show status like "Qcache_inserts";
3341-Variable_name Value
3342-Qcache_inserts 1
3343-show status like "Qcache_hits";
3344-Variable_name Value
3345-Qcache_hits 34
3346------------------------------------------------------
3347-select * from t1
3348------------------------------------------------------
3349-show status like "Qcache_queries_in_cache";
3350-Variable_name Value
3351-Qcache_queries_in_cache 1
3352-show status like "Qcache_inserts";
3353-Variable_name Value
3354-Qcache_inserts 1
3355-show status like "Qcache_hits";
3356-Variable_name Value
3357-Qcache_hits 34
3358-select * from t1 ;
3359-a
3360-1
3361-2
3362-3
3363-select * from t1 ;
3364-a
3365-1
3366-2
3367-3
3368-show status like "Qcache_queries_in_cache";
3369-Variable_name Value
3370-Qcache_queries_in_cache 1
3371-show status like "Qcache_inserts";
3372-Variable_name Value
3373-Qcache_inserts 1
3374-show status like "Qcache_hits";
3375-Variable_name Value
3376-Qcache_hits 36
3377------------------------------------------------------
3378-select * from t1
3379-/* comment in the end */
3380------------------------------------------------------
3381-show status like "Qcache_queries_in_cache";
3382-Variable_name Value
3383-Qcache_queries_in_cache 1
3384-show status like "Qcache_inserts";
3385-Variable_name Value
3386-Qcache_inserts 1
3387-show status like "Qcache_hits";
3388-Variable_name Value
3389-Qcache_hits 36
3390-select * from t1
3391-/* comment in the end */;
3392-a
3393-1
3394-2
3395-3
3396-select * from t1
3397-/* comment in the end */;
3398-a
3399-1
3400-2
3401-3
3402-show status like "Qcache_queries_in_cache";
3403-Variable_name Value
3404-Qcache_queries_in_cache 1
3405-show status like "Qcache_inserts";
3406-Variable_name Value
3407-Qcache_inserts 1
3408-show status like "Qcache_hits";
3409-Variable_name Value
3410-Qcache_hits 38
3411------------------------------------------------------
3412-select * from t1
3413-/* *\/ */
3414------------------------------------------------------
3415-show status like "Qcache_queries_in_cache";
3416-Variable_name Value
3417-Qcache_queries_in_cache 1
3418-show status like "Qcache_inserts";
3419-Variable_name Value
3420-Qcache_inserts 1
3421-show status like "Qcache_hits";
3422-Variable_name Value
3423-Qcache_hits 38
3424-select * from t1
3425-/* *\/ */;
3426-a
3427-1
3428-2
3429-3
3430-select * from t1
3431-/* *\/ */;
3432-a
3433-1
3434-2
3435-3
3436-show status like "Qcache_queries_in_cache";
3437-Variable_name Value
3438-Qcache_queries_in_cache 1
3439-show status like "Qcache_inserts";
3440-Variable_name Value
3441-Qcache_inserts 1
3442-show status like "Qcache_hits";
3443-Variable_name Value
3444-Qcache_hits 40
3445------------------------------------------------------
3446-select * from t1
3447-/* comment in the end */
3448-
3449------------------------------------------------------
3450-show status like "Qcache_queries_in_cache";
3451-Variable_name Value
3452-Qcache_queries_in_cache 1
3453-show status like "Qcache_inserts";
3454-Variable_name Value
3455-Qcache_inserts 1
3456-show status like "Qcache_hits";
3457-Variable_name Value
3458-Qcache_hits 40
3459-select * from t1
3460-/* comment in the end */
3461-;
3462-a
3463-1
3464-2
3465-3
3466-select * from t1
3467-/* comment in the end */
3468-;
3469-a
3470-1
3471-2
3472-3
3473-show status like "Qcache_queries_in_cache";
3474-Variable_name Value
3475-Qcache_queries_in_cache 1
3476-show status like "Qcache_inserts";
3477-Variable_name Value
3478-Qcache_inserts 1
3479-show status like "Qcache_hits";
3480-Variable_name Value
3481-Qcache_hits 42
3482------------------------------------------------------
3483-select * from t1 #comment in the end
3484------------------------------------------------------
3485-show status like "Qcache_queries_in_cache";
3486-Variable_name Value
3487-Qcache_queries_in_cache 1
3488-show status like "Qcache_inserts";
3489-Variable_name Value
3490-Qcache_inserts 1
3491-show status like "Qcache_hits";
3492-Variable_name Value
3493-Qcache_hits 42
3494-select * from t1 #comment in the end;
3495-a
3496-1
3497-2
3498-3
3499-select * from t1 #comment in the end;
3500-a
3501-1
3502-2
3503-3
3504-show status like "Qcache_queries_in_cache";
3505-Variable_name Value
3506-Qcache_queries_in_cache 1
3507-show status like "Qcache_inserts";
3508-Variable_name Value
3509-Qcache_inserts 1
3510-show status like "Qcache_hits";
3511-Variable_name Value
3512-Qcache_hits 44
3513------------------------------------------------------
3514-select * from t1 #comment in the end
3515-
3516------------------------------------------------------
3517-show status like "Qcache_queries_in_cache";
3518-Variable_name Value
3519-Qcache_queries_in_cache 1
3520-show status like "Qcache_inserts";
3521-Variable_name Value
3522-Qcache_inserts 1
3523-show status like "Qcache_hits";
3524-Variable_name Value
3525-Qcache_hits 44
3526-select * from t1 #comment in the end
3527-;
3528-a
3529-1
3530-2
3531-3
3532-select * from t1 #comment in the end
3533-;
3534-a
3535-1
3536-2
3537-3
3538-show status like "Qcache_queries_in_cache";
3539-Variable_name Value
3540-Qcache_queries_in_cache 1
3541-show status like "Qcache_inserts";
3542-Variable_name Value
3543-Qcache_inserts 1
3544-show status like "Qcache_hits";
3545-Variable_name Value
3546-Qcache_hits 46
3547------------------------------------------------------
3548-select * from t1 -- comment in the end
3549------------------------------------------------------
3550-show status like "Qcache_queries_in_cache";
3551-Variable_name Value
3552-Qcache_queries_in_cache 1
3553-show status like "Qcache_inserts";
3554-Variable_name Value
3555-Qcache_inserts 1
3556-show status like "Qcache_hits";
3557-Variable_name Value
3558-Qcache_hits 46
3559-select * from t1 -- comment in the end;
3560-a
3561-1
3562-2
3563-3
3564-select * from t1 -- comment in the end;
3565-a
3566-1
3567-2
3568-3
3569-show status like "Qcache_queries_in_cache";
3570-Variable_name Value
3571-Qcache_queries_in_cache 1
3572-show status like "Qcache_inserts";
3573-Variable_name Value
3574-Qcache_inserts 1
3575-show status like "Qcache_hits";
3576-Variable_name Value
3577-Qcache_hits 48
3578------------------------------------------------------
3579-select * from t1 -- comment in the end
3580-
3581------------------------------------------------------
3582-show status like "Qcache_queries_in_cache";
3583-Variable_name Value
3584-Qcache_queries_in_cache 1
3585-show status like "Qcache_inserts";
3586-Variable_name Value
3587-Qcache_inserts 1
3588-show status like "Qcache_hits";
3589-Variable_name Value
3590-Qcache_hits 48
3591-select * from t1 -- comment in the end
3592-;
3593-a
3594-1
3595-2
3596-3
3597-select * from t1 -- comment in the end
3598-;
3599-a
3600-1
3601-2
3602-3
3603-show status like "Qcache_queries_in_cache";
3604-Variable_name Value
3605-Qcache_queries_in_cache 1
3606-show status like "Qcache_inserts";
3607-Variable_name Value
3608-Qcache_inserts 1
3609-show status like "Qcache_hits";
3610-Variable_name Value
3611-Qcache_hits 50
3612------------------------------------------------------
3613-select ' \' ' from t1
3614------------------------------------------------------
3615-show status like "Qcache_queries_in_cache";
3616-Variable_name Value
3617-Qcache_queries_in_cache 1
3618-show status like "Qcache_inserts";
3619-Variable_name Value
3620-Qcache_inserts 1
3621-show status like "Qcache_hits";
3622-Variable_name Value
3623-Qcache_hits 50
3624-select ' \' ' from t1;
3625-'
3626- '
3627- '
3628- '
3629-select ' \' ' from t1;
3630-'
3631- '
3632- '
3633- '
3634-show status like "Qcache_queries_in_cache";
3635-Variable_name Value
3636-Qcache_queries_in_cache 2
3637-show status like "Qcache_inserts";
3638-Variable_name Value
3639-Qcache_inserts 2
3640-show status like "Qcache_hits";
3641-Variable_name Value
3642-Qcache_hits 51
3643-DROP TABLE t1;
3644-SET GLOBAL query_cache_size=default;
3645-set global query_cache_strip_comments=OFF;
3646
3647=== added file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result'
3648--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 1970-01-01 00:00:00 +0000
3649+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 2013-05-26 07:24:39 +0000
3650@@ -0,0 +1,21 @@
3651+set GLOBAL query_cache_size=1355776;
3652+drop table if exists t1;
3653+create table t1 (a int not null);
3654+insert into t1 values (1),(2),(3);
3655+flush query cache;
3656+flush query cache;
3657+reset query cache;
3658+flush status;
3659+( select * from t1 );
3660+a
3661+1
3662+2
3663+3
3664+/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, @@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), @OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, @@SQL_QUOTE_SHOW_CREATE := 1 */;
3665+/* only comment */;
3666+# only comment
3667+;
3668+-- only comment
3669+;
3670+DROP TABLE t1;
3671+SET GLOBAL query_cache_size= default;
3672
3673=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result'
3674--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 2012-04-18 23:25:43 +0000
3675+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 1970-01-01 00:00:00 +0000
3676@@ -1,21 +0,0 @@
3677-set GLOBAL query_cache_size=1355776;
3678-drop table if exists t1;
3679-create table t1 (a int not null);
3680-insert into t1 values (1),(2),(3);
3681-flush query cache;
3682-flush query cache;
3683-reset query cache;
3684-flush status;
3685-( select * from t1 );
3686-a
3687-1
3688-2
3689-3
3690-/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, @@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), @OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, @@SQL_QUOTE_SHOW_CREATE := 1 */;
3691-/* only comment */;
3692-# only comment
3693-;
3694--- only comment
3695-;
3696-DROP TABLE t1;
3697-SET GLOBAL query_cache_size= default;
3698
3699=== added file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result'
3700--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 1970-01-01 00:00:00 +0000
3701+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 2013-05-26 07:24:39 +0000
3702@@ -0,0 +1,865 @@
3703+set GLOBAL query_cache_size=1355776;
3704+drop table if exists t1;
3705+create table t1 (a int not null);
3706+insert into t1 values (1),(2),(3);
3707+flush query cache;
3708+flush query cache;
3709+reset query cache;
3710+flush status;
3711+flush query cache;
3712+flush query cache;
3713+reset query cache;
3714+flush status;
3715+/* with comment first */select * from t1;
3716+a
3717+1
3718+2
3719+3
3720+-----------------------------------------------------
3721+/* with comment first */select * from t1
3722+-----------------------------------------------------
3723+show status like "Qcache_queries_in_cache";
3724+Variable_name Value
3725+Qcache_queries_in_cache 1
3726+show status like "Qcache_inserts";
3727+Variable_name Value
3728+Qcache_inserts 1
3729+show status like "Qcache_hits";
3730+Variable_name Value
3731+Qcache_hits 0
3732+/* with comment first */select * from t1;
3733+a
3734+1
3735+2
3736+3
3737+/* with comment first */select * from t1;
3738+a
3739+1
3740+2
3741+3
3742+show status like "Qcache_queries_in_cache";
3743+Variable_name Value
3744+Qcache_queries_in_cache 1
3745+show status like "Qcache_inserts";
3746+Variable_name Value
3747+Qcache_inserts 1
3748+show status like "Qcache_hits";
3749+Variable_name Value
3750+Qcache_hits 2
3751+-----------------------------------------------------
3752+# with comment first
3753+select * from t1
3754+-----------------------------------------------------
3755+show status like "Qcache_queries_in_cache";
3756+Variable_name Value
3757+Qcache_queries_in_cache 1
3758+show status like "Qcache_inserts";
3759+Variable_name Value
3760+Qcache_inserts 1
3761+show status like "Qcache_hits";
3762+Variable_name Value
3763+Qcache_hits 2
3764+# with comment first
3765+select * from t1;
3766+a
3767+1
3768+2
3769+3
3770+# with comment first
3771+select * from t1;
3772+a
3773+1
3774+2
3775+3
3776+show status like "Qcache_queries_in_cache";
3777+Variable_name Value
3778+Qcache_queries_in_cache 2
3779+show status like "Qcache_inserts";
3780+Variable_name Value
3781+Qcache_inserts 2
3782+show status like "Qcache_hits";
3783+Variable_name Value
3784+Qcache_hits 2
3785+-----------------------------------------------------
3786+-- with comment first
3787+select * from t1
3788+-----------------------------------------------------
3789+show status like "Qcache_queries_in_cache";
3790+Variable_name Value
3791+Qcache_queries_in_cache 2
3792+show status like "Qcache_inserts";
3793+Variable_name Value
3794+Qcache_inserts 2
3795+show status like "Qcache_hits";
3796+Variable_name Value
3797+Qcache_hits 2
3798+-- with comment first
3799+select * from t1;
3800+a
3801+1
3802+2
3803+3
3804+-- with comment first
3805+select * from t1;
3806+a
3807+1
3808+2
3809+3
3810+show status like "Qcache_queries_in_cache";
3811+Variable_name Value
3812+Qcache_queries_in_cache 3
3813+show status like "Qcache_inserts";
3814+Variable_name Value
3815+Qcache_inserts 3
3816+show status like "Qcache_hits";
3817+Variable_name Value
3818+Qcache_hits 2
3819+-----------------------------------------------------
3820+/* with comment first and "quote" */select * from t1
3821+-----------------------------------------------------
3822+show status like "Qcache_queries_in_cache";
3823+Variable_name Value
3824+Qcache_queries_in_cache 3
3825+show status like "Qcache_inserts";
3826+Variable_name Value
3827+Qcache_inserts 3
3828+show status like "Qcache_hits";
3829+Variable_name Value
3830+Qcache_hits 2
3831+/* with comment first and "quote" */select * from t1;
3832+a
3833+1
3834+2
3835+3
3836+/* with comment first and "quote" */select * from t1;
3837+a
3838+1
3839+2
3840+3
3841+show status like "Qcache_queries_in_cache";
3842+Variable_name Value
3843+Qcache_queries_in_cache 4
3844+show status like "Qcache_inserts";
3845+Variable_name Value
3846+Qcache_inserts 4
3847+show status like "Qcache_hits";
3848+Variable_name Value
3849+Qcache_hits 3
3850+-----------------------------------------------------
3851+# with comment first and "quote"
3852+select * from t1
3853+-----------------------------------------------------
3854+show status like "Qcache_queries_in_cache";
3855+Variable_name Value
3856+Qcache_queries_in_cache 4
3857+show status like "Qcache_inserts";
3858+Variable_name Value
3859+Qcache_inserts 4
3860+show status like "Qcache_hits";
3861+Variable_name Value
3862+Qcache_hits 3
3863+# with comment first and "quote"
3864+select * from t1;
3865+a
3866+1
3867+2
3868+3
3869+# with comment first and "quote"
3870+select * from t1;
3871+a
3872+1
3873+2
3874+3
3875+show status like "Qcache_queries_in_cache";
3876+Variable_name Value
3877+Qcache_queries_in_cache 5
3878+show status like "Qcache_inserts";
3879+Variable_name Value
3880+Qcache_inserts 5
3881+show status like "Qcache_hits";
3882+Variable_name Value
3883+Qcache_hits 3
3884+-----------------------------------------------------
3885+-- with comment first and "quote"
3886+select * from t1
3887+-----------------------------------------------------
3888+show status like "Qcache_queries_in_cache";
3889+Variable_name Value
3890+Qcache_queries_in_cache 5
3891+show status like "Qcache_inserts";
3892+Variable_name Value
3893+Qcache_inserts 5
3894+show status like "Qcache_hits";
3895+Variable_name Value
3896+Qcache_hits 3
3897+-- with comment first and "quote"
3898+select * from t1;
3899+a
3900+1
3901+2
3902+3
3903+-- with comment first and "quote"
3904+select * from t1;
3905+a
3906+1
3907+2
3908+3
3909+show status like "Qcache_queries_in_cache";
3910+Variable_name Value
3911+Qcache_queries_in_cache 6
3912+show status like "Qcache_inserts";
3913+Variable_name Value
3914+Qcache_inserts 6
3915+show status like "Qcache_hits";
3916+Variable_name Value
3917+Qcache_hits 3
3918+-----------------------------------------------------
3919+/* with comment and whitespaces first */select * from t1
3920+-----------------------------------------------------
3921+show status like "Qcache_queries_in_cache";
3922+Variable_name Value
3923+Qcache_queries_in_cache 6
3924+show status like "Qcache_inserts";
3925+Variable_name Value
3926+Qcache_inserts 6
3927+show status like "Qcache_hits";
3928+Variable_name Value
3929+Qcache_hits 3
3930+/* with comment and whitespaces first */select * from t1;
3931+a
3932+1
3933+2
3934+3
3935+/* with comment and whitespaces first */select * from t1;
3936+a
3937+1
3938+2
3939+3
3940+show status like "Qcache_queries_in_cache";
3941+Variable_name Value
3942+Qcache_queries_in_cache 7
3943+show status like "Qcache_inserts";
3944+Variable_name Value
3945+Qcache_inserts 7
3946+show status like "Qcache_hits";
3947+Variable_name Value
3948+Qcache_hits 4
3949+-----------------------------------------------------
3950+# with comment and whitespaces first
3951+select * from t1
3952+-----------------------------------------------------
3953+show status like "Qcache_queries_in_cache";
3954+Variable_name Value
3955+Qcache_queries_in_cache 7
3956+show status like "Qcache_inserts";
3957+Variable_name Value
3958+Qcache_inserts 7
3959+show status like "Qcache_hits";
3960+Variable_name Value
3961+Qcache_hits 4
3962+# with comment and whitespaces first
3963+select * from t1;
3964+a
3965+1
3966+2
3967+3
3968+# with comment and whitespaces first
3969+select * from t1;
3970+a
3971+1
3972+2
3973+3
3974+show status like "Qcache_queries_in_cache";
3975+Variable_name Value
3976+Qcache_queries_in_cache 8
3977+show status like "Qcache_inserts";
3978+Variable_name Value
3979+Qcache_inserts 8
3980+show status like "Qcache_hits";
3981+Variable_name Value
3982+Qcache_hits 4
3983+-----------------------------------------------------
3984+-- with comment and whitespaces first
3985+select * from t1
3986+-----------------------------------------------------
3987+show status like "Qcache_queries_in_cache";
3988+Variable_name Value
3989+Qcache_queries_in_cache 8
3990+show status like "Qcache_inserts";
3991+Variable_name Value
3992+Qcache_inserts 8
3993+show status like "Qcache_hits";
3994+Variable_name Value
3995+Qcache_hits 4
3996+-- with comment and whitespaces first
3997+select * from t1;
3998+a
3999+1
4000+2
4001+3
4002+-- with comment and whitespaces first
4003+select * from t1;
4004+a
4005+1
4006+2
4007+3
4008+show status like "Qcache_queries_in_cache";
4009+Variable_name Value
4010+Qcache_queries_in_cache 9
4011+show status like "Qcache_inserts";
4012+Variable_name Value
4013+Qcache_inserts 9
4014+show status like "Qcache_hits";
4015+Variable_name Value
4016+Qcache_hits 4
4017+-----------------------------------------------------
4018+select * /* internal comment */ from t1
4019+-----------------------------------------------------
4020+show status like "Qcache_queries_in_cache";
4021+Variable_name Value
4022+Qcache_queries_in_cache 9
4023+show status like "Qcache_inserts";
4024+Variable_name Value
4025+Qcache_inserts 9
4026+show status like "Qcache_hits";
4027+Variable_name Value
4028+Qcache_hits 4
4029+select * /* internal comment */ from t1;
4030+a
4031+1
4032+2
4033+3
4034+select * /* internal comment */ from t1;
4035+a
4036+1
4037+2
4038+3
4039+show status like "Qcache_queries_in_cache";
4040+Variable_name Value
4041+Qcache_queries_in_cache 10
4042+show status like "Qcache_inserts";
4043+Variable_name Value
4044+Qcache_inserts 10
4045+show status like "Qcache_hits";
4046+Variable_name Value
4047+Qcache_hits 5
4048+-----------------------------------------------------
4049+select */* internal comment */ from t1
4050+-----------------------------------------------------
4051+show status like "Qcache_queries_in_cache";
4052+Variable_name Value
4053+Qcache_queries_in_cache 10
4054+show status like "Qcache_inserts";
4055+Variable_name Value
4056+Qcache_inserts 10
4057+show status like "Qcache_hits";
4058+Variable_name Value
4059+Qcache_hits 5
4060+select */* internal comment */ from t1;
4061+a
4062+1
4063+2
4064+3
4065+select */* internal comment */ from t1;
4066+a
4067+1
4068+2
4069+3
4070+show status like "Qcache_queries_in_cache";
4071+Variable_name Value
4072+Qcache_queries_in_cache 11
4073+show status like "Qcache_inserts";
4074+Variable_name Value
4075+Qcache_inserts 11
4076+show status like "Qcache_hits";
4077+Variable_name Value
4078+Qcache_hits 6
4079+-----------------------------------------------------
4080+select */* internal comment */from t1
4081+-----------------------------------------------------
4082+show status like "Qcache_queries_in_cache";
4083+Variable_name Value
4084+Qcache_queries_in_cache 11
4085+show status like "Qcache_inserts";
4086+Variable_name Value
4087+Qcache_inserts 11
4088+show status like "Qcache_hits";
4089+Variable_name Value
4090+Qcache_hits 6
4091+select */* internal comment */from t1;
4092+a
4093+1
4094+2
4095+3
4096+select */* internal comment */from t1;
4097+a
4098+1
4099+2
4100+3
4101+show status like "Qcache_queries_in_cache";
4102+Variable_name Value
4103+Qcache_queries_in_cache 12
4104+show status like "Qcache_inserts";
4105+Variable_name Value
4106+Qcache_inserts 12
4107+show status like "Qcache_hits";
4108+Variable_name Value
4109+Qcache_hits 7
4110+-----------------------------------------------------
4111+select * /* internal comment with "quote" */ from t1
4112+-----------------------------------------------------
4113+show status like "Qcache_queries_in_cache";
4114+Variable_name Value
4115+Qcache_queries_in_cache 12
4116+show status like "Qcache_inserts";
4117+Variable_name Value
4118+Qcache_inserts 12
4119+show status like "Qcache_hits";
4120+Variable_name Value
4121+Qcache_hits 7
4122+select * /* internal comment with "quote" */ from t1;
4123+a
4124+1
4125+2
4126+3
4127+select * /* internal comment with "quote" */ from t1;
4128+a
4129+1
4130+2
4131+3
4132+show status like "Qcache_queries_in_cache";
4133+Variable_name Value
4134+Qcache_queries_in_cache 13
4135+show status like "Qcache_inserts";
4136+Variable_name Value
4137+Qcache_inserts 13
4138+show status like "Qcache_hits";
4139+Variable_name Value
4140+Qcache_hits 8
4141+-----------------------------------------------------
4142+select */* internal comment with "quote" */ from t1
4143+-----------------------------------------------------
4144+show status like "Qcache_queries_in_cache";
4145+Variable_name Value
4146+Qcache_queries_in_cache 13
4147+show status like "Qcache_inserts";
4148+Variable_name Value
4149+Qcache_inserts 13
4150+show status like "Qcache_hits";
4151+Variable_name Value
4152+Qcache_hits 8
4153+select */* internal comment with "quote" */ from t1;
4154+a
4155+1
4156+2
4157+3
4158+select */* internal comment with "quote" */ from t1;
4159+a
4160+1
4161+2
4162+3
4163+show status like "Qcache_queries_in_cache";
4164+Variable_name Value
4165+Qcache_queries_in_cache 14
4166+show status like "Qcache_inserts";
4167+Variable_name Value
4168+Qcache_inserts 14
4169+show status like "Qcache_hits";
4170+Variable_name Value
4171+Qcache_hits 9
4172+-----------------------------------------------------
4173+select */* internal comment with "quote" */from t1
4174+-----------------------------------------------------
4175+show status like "Qcache_queries_in_cache";
4176+Variable_name Value
4177+Qcache_queries_in_cache 14
4178+show status like "Qcache_inserts";
4179+Variable_name Value
4180+Qcache_inserts 14
4181+show status like "Qcache_hits";
4182+Variable_name Value
4183+Qcache_hits 9
4184+select */* internal comment with "quote" */from t1;
4185+a
4186+1
4187+2
4188+3
4189+select */* internal comment with "quote" */from t1;
4190+a
4191+1
4192+2
4193+3
4194+show status like "Qcache_queries_in_cache";
4195+Variable_name Value
4196+Qcache_queries_in_cache 15
4197+show status like "Qcache_inserts";
4198+Variable_name Value
4199+Qcache_inserts 15
4200+show status like "Qcache_hits";
4201+Variable_name Value
4202+Qcache_hits 10
4203+-----------------------------------------------------
4204+select * from t1
4205+
4206+-----------------------------------------------------
4207+show status like "Qcache_queries_in_cache";
4208+Variable_name Value
4209+Qcache_queries_in_cache 15
4210+show status like "Qcache_inserts";
4211+Variable_name Value
4212+Qcache_inserts 15
4213+show status like "Qcache_hits";
4214+Variable_name Value
4215+Qcache_hits 10
4216+select * from t1
4217+;
4218+a
4219+1
4220+2
4221+3
4222+select * from t1
4223+;
4224+a
4225+1
4226+2
4227+3
4228+show status like "Qcache_queries_in_cache";
4229+Variable_name Value
4230+Qcache_queries_in_cache 16
4231+show status like "Qcache_inserts";
4232+Variable_name Value
4233+Qcache_inserts 16
4234+show status like "Qcache_hits";
4235+Variable_name Value
4236+Qcache_hits 11
4237+-----------------------------------------------------
4238+select * from t1
4239+-----------------------------------------------------
4240+show status like "Qcache_queries_in_cache";
4241+Variable_name Value
4242+Qcache_queries_in_cache 16
4243+show status like "Qcache_inserts";
4244+Variable_name Value
4245+Qcache_inserts 16
4246+show status like "Qcache_hits";
4247+Variable_name Value
4248+Qcache_hits 11
4249+select * from t1 ;
4250+a
4251+1
4252+2
4253+3
4254+select * from t1 ;
4255+a
4256+1
4257+2
4258+3
4259+show status like "Qcache_queries_in_cache";
4260+Variable_name Value
4261+Qcache_queries_in_cache 16
4262+show status like "Qcache_inserts";
4263+Variable_name Value
4264+Qcache_inserts 16
4265+show status like "Qcache_hits";
4266+Variable_name Value
4267+Qcache_hits 13
4268+-----------------------------------------------------
4269+select * from t1
4270+-----------------------------------------------------
4271+show status like "Qcache_queries_in_cache";
4272+Variable_name Value
4273+Qcache_queries_in_cache 16
4274+show status like "Qcache_inserts";
4275+Variable_name Value
4276+Qcache_inserts 16
4277+show status like "Qcache_hits";
4278+Variable_name Value
4279+Qcache_hits 13
4280+select * from t1 ;
4281+a
4282+1
4283+2
4284+3
4285+select * from t1 ;
4286+a
4287+1
4288+2
4289+3
4290+show status like "Qcache_queries_in_cache";
4291+Variable_name Value
4292+Qcache_queries_in_cache 16
4293+show status like "Qcache_inserts";
4294+Variable_name Value
4295+Qcache_inserts 16
4296+show status like "Qcache_hits";
4297+Variable_name Value
4298+Qcache_hits 15
4299+-----------------------------------------------------
4300+select * from t1
4301+/* comment in the end */
4302+-----------------------------------------------------
4303+show status like "Qcache_queries_in_cache";
4304+Variable_name Value
4305+Qcache_queries_in_cache 16
4306+show status like "Qcache_inserts";
4307+Variable_name Value
4308+Qcache_inserts 16
4309+show status like "Qcache_hits";
4310+Variable_name Value
4311+Qcache_hits 15
4312+select * from t1
4313+/* comment in the end */;
4314+a
4315+1
4316+2
4317+3
4318+select * from t1
4319+/* comment in the end */;
4320+a
4321+1
4322+2
4323+3
4324+show status like "Qcache_queries_in_cache";
4325+Variable_name Value
4326+Qcache_queries_in_cache 17
4327+show status like "Qcache_inserts";
4328+Variable_name Value
4329+Qcache_inserts 17
4330+show status like "Qcache_hits";
4331+Variable_name Value
4332+Qcache_hits 16
4333+-----------------------------------------------------
4334+select * from t1
4335+/* *\/ */
4336+-----------------------------------------------------
4337+show status like "Qcache_queries_in_cache";
4338+Variable_name Value
4339+Qcache_queries_in_cache 17
4340+show status like "Qcache_inserts";
4341+Variable_name Value
4342+Qcache_inserts 17
4343+show status like "Qcache_hits";
4344+Variable_name Value
4345+Qcache_hits 16
4346+select * from t1
4347+/* *\/ */;
4348+a
4349+1
4350+2
4351+3
4352+select * from t1
4353+/* *\/ */;
4354+a
4355+1
4356+2
4357+3
4358+show status like "Qcache_queries_in_cache";
4359+Variable_name Value
4360+Qcache_queries_in_cache 18
4361+show status like "Qcache_inserts";
4362+Variable_name Value
4363+Qcache_inserts 18
4364+show status like "Qcache_hits";
4365+Variable_name Value
4366+Qcache_hits 17
4367+-----------------------------------------------------
4368+select * from t1
4369+/* comment in the end */
4370+
4371+-----------------------------------------------------
4372+show status like "Qcache_queries_in_cache";
4373+Variable_name Value
4374+Qcache_queries_in_cache 18
4375+show status like "Qcache_inserts";
4376+Variable_name Value
4377+Qcache_inserts 18
4378+show status like "Qcache_hits";
4379+Variable_name Value
4380+Qcache_hits 17
4381+select * from t1
4382+/* comment in the end */
4383+;
4384+a
4385+1
4386+2
4387+3
4388+select * from t1
4389+/* comment in the end */
4390+;
4391+a
4392+1
4393+2
4394+3
4395+show status like "Qcache_queries_in_cache";
4396+Variable_name Value
4397+Qcache_queries_in_cache 18
4398+show status like "Qcache_inserts";
4399+Variable_name Value
4400+Qcache_inserts 18
4401+show status like "Qcache_hits";
4402+Variable_name Value
4403+Qcache_hits 19
4404+-----------------------------------------------------
4405+select * from t1 #comment in the end
4406+-----------------------------------------------------
4407+show status like "Qcache_queries_in_cache";
4408+Variable_name Value
4409+Qcache_queries_in_cache 18
4410+show status like "Qcache_inserts";
4411+Variable_name Value
4412+Qcache_inserts 18
4413+show status like "Qcache_hits";
4414+Variable_name Value
4415+Qcache_hits 19
4416+select * from t1 #comment in the end;
4417+a
4418+1
4419+2
4420+3
4421+select * from t1 #comment in the end;
4422+a
4423+1
4424+2
4425+3
4426+show status like "Qcache_queries_in_cache";
4427+Variable_name Value
4428+Qcache_queries_in_cache 19
4429+show status like "Qcache_inserts";
4430+Variable_name Value
4431+Qcache_inserts 19
4432+show status like "Qcache_hits";
4433+Variable_name Value
4434+Qcache_hits 20
4435+-----------------------------------------------------
4436+select * from t1 #comment in the end
4437+
4438+-----------------------------------------------------
4439+show status like "Qcache_queries_in_cache";
4440+Variable_name Value
4441+Qcache_queries_in_cache 19
4442+show status like "Qcache_inserts";
4443+Variable_name Value
4444+Qcache_inserts 19
4445+show status like "Qcache_hits";
4446+Variable_name Value
4447+Qcache_hits 20
4448+select * from t1 #comment in the end
4449+;
4450+a
4451+1
4452+2
4453+3
4454+select * from t1 #comment in the end
4455+;
4456+a
4457+1
4458+2
4459+3
4460+show status like "Qcache_queries_in_cache";
4461+Variable_name Value
4462+Qcache_queries_in_cache 19
4463+show status like "Qcache_inserts";
4464+Variable_name Value
4465+Qcache_inserts 19
4466+show status like "Qcache_hits";
4467+Variable_name Value
4468+Qcache_hits 22
4469+-----------------------------------------------------
4470+select * from t1 -- comment in the end
4471+-----------------------------------------------------
4472+show status like "Qcache_queries_in_cache";
4473+Variable_name Value
4474+Qcache_queries_in_cache 19
4475+show status like "Qcache_inserts";
4476+Variable_name Value
4477+Qcache_inserts 19
4478+show status like "Qcache_hits";
4479+Variable_name Value
4480+Qcache_hits 22
4481+select * from t1 -- comment in the end;
4482+a
4483+1
4484+2
4485+3
4486+select * from t1 -- comment in the end;
4487+a
4488+1
4489+2
4490+3
4491+show status like "Qcache_queries_in_cache";
4492+Variable_name Value
4493+Qcache_queries_in_cache 20
4494+show status like "Qcache_inserts";
4495+Variable_name Value
4496+Qcache_inserts 20
4497+show status like "Qcache_hits";
4498+Variable_name Value
4499+Qcache_hits 23
4500+-----------------------------------------------------
4501+select * from t1 -- comment in the end
4502+
4503+-----------------------------------------------------
4504+show status like "Qcache_queries_in_cache";
4505+Variable_name Value
4506+Qcache_queries_in_cache 20
4507+show status like "Qcache_inserts";
4508+Variable_name Value
4509+Qcache_inserts 20
4510+show status like "Qcache_hits";
4511+Variable_name Value
4512+Qcache_hits 23
4513+select * from t1 -- comment in the end
4514+;
4515+a
4516+1
4517+2
4518+3
4519+select * from t1 -- comment in the end
4520+;
4521+a
4522+1
4523+2
4524+3
4525+show status like "Qcache_queries_in_cache";
4526+Variable_name Value
4527+Qcache_queries_in_cache 20
4528+show status like "Qcache_inserts";
4529+Variable_name Value
4530+Qcache_inserts 20
4531+show status like "Qcache_hits";
4532+Variable_name Value
4533+Qcache_hits 25
4534+-----------------------------------------------------
4535+select ' \' ' from t1
4536+-----------------------------------------------------
4537+show status like "Qcache_queries_in_cache";
4538+Variable_name Value
4539+Qcache_queries_in_cache 20
4540+show status like "Qcache_inserts";
4541+Variable_name Value
4542+Qcache_inserts 20
4543+show status like "Qcache_hits";
4544+Variable_name Value
4545+Qcache_hits 25
4546+select ' \' ' from t1;
4547+'
4548+ '
4549+ '
4550+ '
4551+select ' \' ' from t1;
4552+'
4553+ '
4554+ '
4555+ '
4556+show status like "Qcache_queries_in_cache";
4557+Variable_name Value
4558+Qcache_queries_in_cache 21
4559+show status like "Qcache_inserts";
4560+Variable_name Value
4561+Qcache_inserts 21
4562+show status like "Qcache_hits";
4563+Variable_name Value
4564+Qcache_hits 26
4565+DROP TABLE t1;
4566+SET GLOBAL query_cache_size=default;
4567+set global query_cache_strip_comments=OFF;
4568
4569=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result'
4570--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 2012-04-18 23:25:43 +0000
4571+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 1970-01-01 00:00:00 +0000
4572@@ -1,865 +0,0 @@
4573-set GLOBAL query_cache_size=1355776;
4574-drop table if exists t1;
4575-create table t1 (a int not null);
4576-insert into t1 values (1),(2),(3);
4577-flush query cache;
4578-flush query cache;
4579-reset query cache;
4580-flush status;
4581-flush query cache;
4582-flush query cache;
4583-reset query cache;
4584-flush status;
4585-/* with comment first */select * from t1;
4586-a
4587-1
4588-2
4589-3
4590------------------------------------------------------
4591-/* with comment first */select * from t1
4592------------------------------------------------------
4593-show status like "Qcache_queries_in_cache";
4594-Variable_name Value
4595-Qcache_queries_in_cache 1
4596-show status like "Qcache_inserts";
4597-Variable_name Value
4598-Qcache_inserts 1
4599-show status like "Qcache_hits";
4600-Variable_name Value
4601-Qcache_hits 0
4602-/* with comment first */select * from t1;
4603-a
4604-1
4605-2
4606-3
4607-/* with comment first */select * from t1;
4608-a
4609-1
4610-2
4611-3
4612-show status like "Qcache_queries_in_cache";
4613-Variable_name Value
4614-Qcache_queries_in_cache 1
4615-show status like "Qcache_inserts";
4616-Variable_name Value
4617-Qcache_inserts 1
4618-show status like "Qcache_hits";
4619-Variable_name Value
4620-Qcache_hits 2
4621------------------------------------------------------
4622-# with comment first
4623-select * from t1
4624------------------------------------------------------
4625-show status like "Qcache_queries_in_cache";
4626-Variable_name Value
4627-Qcache_queries_in_cache 1
4628-show status like "Qcache_inserts";
4629-Variable_name Value
4630-Qcache_inserts 1
4631-show status like "Qcache_hits";
4632-Variable_name Value
4633-Qcache_hits 2
4634-# with comment first
4635-select * from t1;
4636-a
4637-1
4638-2
4639-3
4640-# with comment first
4641-select * from t1;
4642-a
4643-1
4644-2
4645-3
4646-show status like "Qcache_queries_in_cache";
4647-Variable_name Value
4648-Qcache_queries_in_cache 2
4649-show status like "Qcache_inserts";
4650-Variable_name Value
4651-Qcache_inserts 2
4652-show status like "Qcache_hits";
4653-Variable_name Value
4654-Qcache_hits 2
4655------------------------------------------------------
4656--- with comment first
4657-select * from t1
4658------------------------------------------------------
4659-show status like "Qcache_queries_in_cache";
4660-Variable_name Value
4661-Qcache_queries_in_cache 2
4662-show status like "Qcache_inserts";
4663-Variable_name Value
4664-Qcache_inserts 2
4665-show status like "Qcache_hits";
4666-Variable_name Value
4667-Qcache_hits 2
4668--- with comment first
4669-select * from t1;
4670-a
4671-1
4672-2
4673-3
4674--- with comment first
4675-select * from t1;
4676-a
4677-1
4678-2
4679-3
4680-show status like "Qcache_queries_in_cache";
4681-Variable_name Value
4682-Qcache_queries_in_cache 3
4683-show status like "Qcache_inserts";
4684-Variable_name Value
4685-Qcache_inserts 3
4686-show status like "Qcache_hits";
4687-Variable_name Value
4688-Qcache_hits 2
4689------------------------------------------------------
4690-/* with comment first and "quote" */select * from t1
4691------------------------------------------------------
4692-show status like "Qcache_queries_in_cache";
4693-Variable_name Value
4694-Qcache_queries_in_cache 3
4695-show status like "Qcache_inserts";
4696-Variable_name Value
4697-Qcache_inserts 3
4698-show status like "Qcache_hits";
4699-Variable_name Value
4700-Qcache_hits 2
4701-/* with comment first and "quote" */select * from t1;
4702-a
4703-1
4704-2
4705-3
4706-/* with comment first and "quote" */select * from t1;
4707-a
4708-1
4709-2
4710-3
4711-show status like "Qcache_queries_in_cache";
4712-Variable_name Value
4713-Qcache_queries_in_cache 4
4714-show status like "Qcache_inserts";
4715-Variable_name Value
4716-Qcache_inserts 4
4717-show status like "Qcache_hits";
4718-Variable_name Value
4719-Qcache_hits 3
4720------------------------------------------------------
4721-# with comment first and "quote"
4722-select * from t1
4723------------------------------------------------------
4724-show status like "Qcache_queries_in_cache";
4725-Variable_name Value
4726-Qcache_queries_in_cache 4
4727-show status like "Qcache_inserts";
4728-Variable_name Value
4729-Qcache_inserts 4
4730-show status like "Qcache_hits";
4731-Variable_name Value
4732-Qcache_hits 3
4733-# with comment first and "quote"
4734-select * from t1;
4735-a
4736-1
4737-2
4738-3
4739-# with comment first and "quote"
4740-select * from t1;
4741-a
4742-1
4743-2
4744-3
4745-show status like "Qcache_queries_in_cache";
4746-Variable_name Value
4747-Qcache_queries_in_cache 5
4748-show status like "Qcache_inserts";
4749-Variable_name Value
4750-Qcache_inserts 5
4751-show status like "Qcache_hits";
4752-Variable_name Value
4753-Qcache_hits 3
4754------------------------------------------------------
4755--- with comment first and "quote"
4756-select * from t1
4757------------------------------------------------------
4758-show status like "Qcache_queries_in_cache";
4759-Variable_name Value
4760-Qcache_queries_in_cache 5
4761-show status like "Qcache_inserts";
4762-Variable_name Value
4763-Qcache_inserts 5
4764-show status like "Qcache_hits";
4765-Variable_name Value
4766-Qcache_hits 3
4767--- with comment first and "quote"
4768-select * from t1;
4769-a
4770-1
4771-2
4772-3
4773--- with comment first and "quote"
4774-select * from t1;
4775-a
4776-1
4777-2
4778-3
4779-show status like "Qcache_queries_in_cache";
4780-Variable_name Value
4781-Qcache_queries_in_cache 6
4782-show status like "Qcache_inserts";
4783-Variable_name Value
4784-Qcache_inserts 6
4785-show status like "Qcache_hits";
4786-Variable_name Value
4787-Qcache_hits 3
4788------------------------------------------------------
4789-/* with comment and whitespaces first */select * from t1
4790------------------------------------------------------
4791-show status like "Qcache_queries_in_cache";
4792-Variable_name Value
4793-Qcache_queries_in_cache 6
4794-show status like "Qcache_inserts";
4795-Variable_name Value
4796-Qcache_inserts 6
4797-show status like "Qcache_hits";
4798-Variable_name Value
4799-Qcache_hits 3
4800-/* with comment and whitespaces first */select * from t1;
4801-a
4802-1
4803-2
4804-3
4805-/* with comment and whitespaces first */select * from t1;
4806-a
4807-1
4808-2
4809-3
4810-show status like "Qcache_queries_in_cache";
4811-Variable_name Value
4812-Qcache_queries_in_cache 7
4813-show status like "Qcache_inserts";
4814-Variable_name Value
4815-Qcache_inserts 7
4816-show status like "Qcache_hits";
4817-Variable_name Value
4818-Qcache_hits 4
4819------------------------------------------------------
4820-# with comment and whitespaces first
4821-select * from t1
4822------------------------------------------------------
4823-show status like "Qcache_queries_in_cache";
4824-Variable_name Value
4825-Qcache_queries_in_cache 7
4826-show status like "Qcache_inserts";
4827-Variable_name Value
4828-Qcache_inserts 7
4829-show status like "Qcache_hits";
4830-Variable_name Value
4831-Qcache_hits 4
4832-# with comment and whitespaces first
4833-select * from t1;
4834-a
4835-1
4836-2
4837-3
4838-# with comment and whitespaces first
4839-select * from t1;
4840-a
4841-1
4842-2
4843-3
4844-show status like "Qcache_queries_in_cache";
4845-Variable_name Value
4846-Qcache_queries_in_cache 8
4847-show status like "Qcache_inserts";
4848-Variable_name Value
4849-Qcache_inserts 8
4850-show status like "Qcache_hits";
4851-Variable_name Value
4852-Qcache_hits 4
4853------------------------------------------------------
4854--- with comment and whitespaces first
4855-select * from t1
4856------------------------------------------------------
4857-show status like "Qcache_queries_in_cache";
4858-Variable_name Value
4859-Qcache_queries_in_cache 8
4860-show status like "Qcache_inserts";
4861-Variable_name Value
4862-Qcache_inserts 8
4863-show status like "Qcache_hits";
4864-Variable_name Value
4865-Qcache_hits 4
4866--- with comment and whitespaces first
4867-select * from t1;
4868-a
4869-1
4870-2
4871-3
4872--- with comment and whitespaces first
4873-select * from t1;
4874-a
4875-1
4876-2
4877-3
4878-show status like "Qcache_queries_in_cache";
4879-Variable_name Value
4880-Qcache_queries_in_cache 9
4881-show status like "Qcache_inserts";
4882-Variable_name Value
4883-Qcache_inserts 9
4884-show status like "Qcache_hits";
4885-Variable_name Value
4886-Qcache_hits 4
4887------------------------------------------------------
4888-select * /* internal comment */ from t1
4889------------------------------------------------------
4890-show status like "Qcache_queries_in_cache";
4891-Variable_name Value
4892-Qcache_queries_in_cache 9
4893-show status like "Qcache_inserts";
4894-Variable_name Value
4895-Qcache_inserts 9
4896-show status like "Qcache_hits";
4897-Variable_name Value
4898-Qcache_hits 4
4899-select * /* internal comment */ from t1;
4900-a
4901-1
4902-2
4903-3
4904-select * /* internal comment */ from t1;
4905-a
4906-1
4907-2
4908-3
4909-show status like "Qcache_queries_in_cache";
4910-Variable_name Value
4911-Qcache_queries_in_cache 10
4912-show status like "Qcache_inserts";
4913-Variable_name Value
4914-Qcache_inserts 10
4915-show status like "Qcache_hits";
4916-Variable_name Value
4917-Qcache_hits 5
4918------------------------------------------------------
4919-select */* internal comment */ from t1
4920------------------------------------------------------
4921-show status like "Qcache_queries_in_cache";
4922-Variable_name Value
4923-Qcache_queries_in_cache 10
4924-show status like "Qcache_inserts";
4925-Variable_name Value
4926-Qcache_inserts 10
4927-show status like "Qcache_hits";
4928-Variable_name Value
4929-Qcache_hits 5
4930-select */* internal comment */ from t1;
4931-a
4932-1
4933-2
4934-3
4935-select */* internal comment */ from t1;
4936-a
4937-1
4938-2
4939-3
4940-show status like "Qcache_queries_in_cache";
4941-Variable_name Value
4942-Qcache_queries_in_cache 11
4943-show status like "Qcache_inserts";
4944-Variable_name Value
4945-Qcache_inserts 11
4946-show status like "Qcache_hits";
4947-Variable_name Value
4948-Qcache_hits 6
4949------------------------------------------------------
4950-select */* internal comment */from t1
4951------------------------------------------------------
4952-show status like "Qcache_queries_in_cache";
4953-Variable_name Value
4954-Qcache_queries_in_cache 11
4955-show status like "Qcache_inserts";
4956-Variable_name Value
4957-Qcache_inserts 11
4958-show status like "Qcache_hits";
4959-Variable_name Value
4960-Qcache_hits 6
4961-select */* internal comment */from t1;
4962-a
4963-1
4964-2
4965-3
4966-select */* internal comment */from t1;
4967-a
4968-1
4969-2
4970-3
4971-show status like "Qcache_queries_in_cache";
4972-Variable_name Value
4973-Qcache_queries_in_cache 12
4974-show status like "Qcache_inserts";
4975-Variable_name Value
4976-Qcache_inserts 12
4977-show status like "Qcache_hits";
4978-Variable_name Value
4979-Qcache_hits 7
4980------------------------------------------------------
4981-select * /* internal comment with "quote" */ from t1
4982------------------------------------------------------
4983-show status like "Qcache_queries_in_cache";
4984-Variable_name Value
4985-Qcache_queries_in_cache 12
4986-show status like "Qcache_inserts";
4987-Variable_name Value
4988-Qcache_inserts 12
4989-show status like "Qcache_hits";
4990-Variable_name Value
4991-Qcache_hits 7
4992-select * /* internal comment with "quote" */ from t1;
4993-a
4994-1
4995-2
4996-3
4997-select * /* internal comment with "quote" */ from t1;
4998-a
4999-1
5000-2
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches