Merge lp:~laurynas-biveinis/percona-server/tree-fixes-5.5 into lp:percona-server/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
=== added file 'COPYING.show_temp_51'
--- COPYING.show_temp_51 1970-01-01 00:00:00 +0000
+++ COPYING.show_temp_51 2013-05-26 07:24:39 +0000
@@ -0,0 +1,13 @@
1Portions of this software contain modifications contributed by Venu Anuganti.
2These contributions are used with the following license:
3
4Copyright (c) 2010, Venu Anuganti, http://venublog.com/
5All rights reserved.
6
7Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
8
9 * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10 * 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.
11 * 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.
12
13THIS 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.
014
=== removed file 'COPYING.show_temp_51'
--- COPYING.show_temp_51 2010-12-09 18:30:58 +0000
+++ COPYING.show_temp_51 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
1Portions of this software contain modifications contributed by Venu Anuganti.
2These contributions are used with the following license:
3
4Copyright (c) 2010, Venu Anuganti, http://venublog.com/
5All rights reserved.
6
7Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
8
9 * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10 * 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.
11 * 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.
12
13THIS 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.
140
=== added file 'Percona-Server/include/flashcache_ioctl.h'
--- Percona-Server/include/flashcache_ioctl.h 1970-01-01 00:00:00 +0000
+++ Percona-Server/include/flashcache_ioctl.h 2013-05-26 07:24:39 +0000
@@ -0,0 +1,53 @@
1/****************************************************************************
2 * flashcache_ioctl.h
3 * FlashCache: Device mapper target for block-level disk caching
4 *
5 * Copyright 2010 Facebook, Inc.
6 * Author: Mohan Srinivasan (mohan@facebook.com)
7 *
8 * Based on DM-Cache:
9 * Copyright (C) International Business Machines Corp., 2006
10 * Author: Ming Zhao (mingzhao@ufl.edu)
11 *
12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; under version 2 of the License.
15 *
16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this program. If not, see <http://www.gnu.org/licenses/>.
23 ****************************************************************************/
24
25#ifndef FLASHCACHE_IOCTL_H
26#define FLASHCACHE_IOCTL_H
27
28#include <linux/types.h>
29
30#define FLASHCACHE_IOCTL 0xfe
31
32enum {
33 FLASHCACHEADDNCPID_CMD=200,
34 FLASHCACHEDELNCPID_CMD,
35 FLASHCACHEDELNCALL_CMD,
36 FLASHCACHEADDWHITELIST_CMD,
37 FLASHCACHEDELWHITELIST_CMD,
38 FLASHCACHEDELWHITELISTALL_CMD,
39};
40
41#define FLASHCACHEADDNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDNCPID_CMD, pid_t)
42#define FLASHCACHEDELNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCPID_CMD, pid_t)
43#define FLASHCACHEDELNCALL _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCALL_CMD, pid_t)
44
45#define FLASHCACHEADDBLACKLIST FLASHCACHEADDNCPID
46#define FLASHCACHEDELBLACKLIST FLASHCACHEDELNCPID
47#define FLASHCACHEDELALLBLACKLIST FLASHCACHEDELNCALL
48
49#define FLASHCACHEADDWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDWHITELIST_CMD, pid_t)
50#define FLASHCACHEDELWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELIST_CMD, pid_t)
51#define FLASHCACHEDELALLWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELISTALL_CMD, pid_t)
52
53#endif
054
=== removed file 'Percona-Server/include/flashcache_ioctl.h'
--- Percona-Server/include/flashcache_ioctl.h 2012-04-18 23:25:54 +0000
+++ Percona-Server/include/flashcache_ioctl.h 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
1/****************************************************************************
2 * flashcache_ioctl.h
3 * FlashCache: Device mapper target for block-level disk caching
4 *
5 * Copyright 2010 Facebook, Inc.
6 * Author: Mohan Srinivasan (mohan@facebook.com)
7 *
8 * Based on DM-Cache:
9 * Copyright (C) International Business Machines Corp., 2006
10 * Author: Ming Zhao (mingzhao@ufl.edu)
11 *
12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; under version 2 of the License.
15 *
16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this program. If not, see <http://www.gnu.org/licenses/>.
23 ****************************************************************************/
24
25#ifndef FLASHCACHE_IOCTL_H
26#define FLASHCACHE_IOCTL_H
27
28#include <linux/types.h>
29
30#define FLASHCACHE_IOCTL 0xfe
31
32enum {
33 FLASHCACHEADDNCPID_CMD=200,
34 FLASHCACHEDELNCPID_CMD,
35 FLASHCACHEDELNCALL_CMD,
36 FLASHCACHEADDWHITELIST_CMD,
37 FLASHCACHEDELWHITELIST_CMD,
38 FLASHCACHEDELWHITELISTALL_CMD,
39};
40
41#define FLASHCACHEADDNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDNCPID_CMD, pid_t)
42#define FLASHCACHEDELNCPID _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCPID_CMD, pid_t)
43#define FLASHCACHEDELNCALL _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELNCALL_CMD, pid_t)
44
45#define FLASHCACHEADDBLACKLIST FLASHCACHEADDNCPID
46#define FLASHCACHEDELBLACKLIST FLASHCACHEDELNCPID
47#define FLASHCACHEDELALLBLACKLIST FLASHCACHEDELNCALL
48
49#define FLASHCACHEADDWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEADDWHITELIST_CMD, pid_t)
50#define FLASHCACHEDELWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELIST_CMD, pid_t)
51#define FLASHCACHEDELALLWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELISTALL_CMD, pid_t)
52
53#endif
540
=== added file 'Percona-Server/mysql-test/include/have_response_time_distribution.inc'
--- Percona-Server/mysql-test/include/have_response_time_distribution.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_response_time_distribution.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,4 @@
1-- require r/have_response_time_distribution.require
2disable_query_log;
3show variables like 'have_response_time_distribution';
4enable_query_log;
05
=== removed file 'Percona-Server/mysql-test/include/have_response_time_distribution.inc'
--- Percona-Server/mysql-test/include/have_response_time_distribution.inc 2012-04-18 23:25:50 +0000
+++ Percona-Server/mysql-test/include/have_response_time_distribution.inc 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1-- require r/have_response_time_distribution.require
2disable_query_log;
3show variables like 'have_response_time_distribution';
4enable_query_log;
50
=== added file 'Percona-Server/mysql-test/include/log_grep.inc'
--- Percona-Server/mysql-test/include/log_grep.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/log_grep.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,41 @@
1--echo [log_grep.inc] file: $log_file pattern: $grep_pattern
2perl;
3 $log_file= $ENV{'log_file'};
4 $log_file_full_path= $ENV{'log_file_full_path'};
5 $log_slow_rate_test= $ENV{'log_slow_rate_test'};
6 open(FILE, "$log_file_full_path")
7 or die("Cannot open file $log_file_full_path: $!\n");
8
9 if ($log_slow_rate_test) {
10 $one= 0;
11 $two= 0;
12 $three= 0;
13 while(<FILE>) {
14 $one++ if(/'connection_one'/);
15 $two++ if(/'connection_two'/);
16 $three++ if(/'connection_three'/);
17 }
18 $sum= $one + $two + $three;
19 $zero= 0;
20 if ($one == 0) {
21 $zero++;
22 }
23 if ($two == 0) {
24 $zero++;
25 }
26 if ($three == 0) {
27 $zero++;
28 }
29 print "[log_grep.inc] sum: $sum\n";
30 print "[log_grep.inc] zero: $zero\n";
31 }
32 else {
33 $grep_pattern= $ENV{'grep_pattern'};
34 $lines= 0;
35 while(<FILE>) {
36 $lines++ if (/$grep_pattern/);
37 }
38 print "[log_grep.inc] lines: $lines\n";
39 }
40 close(FILE);
41EOF
042
=== removed file 'Percona-Server/mysql-test/include/log_grep.inc'
--- Percona-Server/mysql-test/include/log_grep.inc 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/include/log_grep.inc 1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
1--echo [log_grep.inc] file: $log_file pattern: $grep_pattern
2perl;
3 $log_file= $ENV{'log_file'};
4 $log_file_full_path= $ENV{'log_file_full_path'};
5 $log_slow_rate_test= $ENV{'log_slow_rate_test'};
6 open(FILE, "$log_file_full_path")
7 or die("Cannot open file $log_file_full_path: $!\n");
8
9 if ($log_slow_rate_test) {
10 $one= 0;
11 $two= 0;
12 $three= 0;
13 while(<FILE>) {
14 $one++ if(/'connection_one'/);
15 $two++ if(/'connection_two'/);
16 $three++ if(/'connection_three'/);
17 }
18 $sum= $one + $two + $three;
19 $zero= 0;
20 if ($one == 0) {
21 $zero++;
22 }
23 if ($two == 0) {
24 $zero++;
25 }
26 if ($three == 0) {
27 $zero++;
28 }
29 print "[log_grep.inc] sum: $sum\n";
30 print "[log_grep.inc] zero: $zero\n";
31 }
32 else {
33 $grep_pattern= $ENV{'grep_pattern'};
34 $lines= 0;
35 while(<FILE>) {
36 $lines++ if (/$grep_pattern/);
37 }
38 print "[log_grep.inc] lines: $lines\n";
39 }
40 close(FILE);
41EOF
420
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,95 @@
1--source include/percona_query_cache_with_comments_clear.inc
2let $query=/* with comment first */select * from t1;
3eval $query;
4--source include/percona_query_cache_with_comments_eval.inc
5
6let $query=# with comment first
7select * from t1;
8--source include/percona_query_cache_with_comments_eval.inc
9
10let $query=-- with comment first
11select * from t1;
12--source include/percona_query_cache_with_comments_eval.inc
13
14let $query=/* with comment first and "quote" */select * from t1;
15--source include/percona_query_cache_with_comments_eval.inc
16
17let $query=# with comment first and "quote"
18select * from t1;
19--source include/percona_query_cache_with_comments_eval.inc
20
21let $query=-- with comment first and "quote"
22select * from t1;
23--source include/percona_query_cache_with_comments_eval.inc
24
25let $query=
26 /* with comment and whitespaces first */select * from t1;
27--source include/percona_query_cache_with_comments_eval.inc
28
29let $query=
30 # with comment and whitespaces first
31select * from t1;
32--source include/percona_query_cache_with_comments_eval.inc
33
34let $query=
35 -- with comment and whitespaces first
36select * from t1;
37--source include/percona_query_cache_with_comments_eval.inc
38
39let $internal=* internal comment *;
40
41let $query=select * /$internal/ from t1;
42--source include/percona_query_cache_with_comments_eval.inc
43let $query=select */$internal/ from t1;
44--source include/percona_query_cache_with_comments_eval.inc
45let $query=select */$internal/from t1;
46--source include/percona_query_cache_with_comments_eval.inc
47
48let $internal=* internal comment with "quote" *;
49
50let $query=select * /$internal/ from t1;
51--source include/percona_query_cache_with_comments_eval.inc
52let $query=select */$internal/ from t1;
53--source include/percona_query_cache_with_comments_eval.inc
54let $query=select */$internal/from t1;
55--source include/percona_query_cache_with_comments_eval.inc
56
57let $query=select * from t1
58;
59--source include/percona_query_cache_with_comments_eval.inc
60
61let $query=select * from t1 ;
62--source include/percona_query_cache_with_comments_eval.inc
63
64let $query=select * from t1 ;
65--source include/percona_query_cache_with_comments_eval.inc
66
67let $query=select * from t1
68/* comment in the end */;
69--source include/percona_query_cache_with_comments_eval.inc
70
71let $query=select * from t1
72/* *\/ */;
73--source include/percona_query_cache_with_comments_eval.inc
74
75let $query=select * from t1
76/* comment in the end */
77;
78--source include/percona_query_cache_with_comments_eval.inc
79
80let $query=select * from t1 #comment in the end;
81--source include/percona_query_cache_with_comments_eval.inc
82
83let $query=select * from t1 #comment in the end
84;
85--source include/percona_query_cache_with_comments_eval.inc
86
87let $query=select * from t1 -- comment in the end;
88--source include/percona_query_cache_with_comments_eval.inc
89
90let $query=select * from t1 -- comment in the end
91;
92--source include/percona_query_cache_with_comments_eval.inc
93
94let $query=select ' \' ' from t1;
95--source include/percona_query_cache_with_comments_eval.inc
096
=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc 1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
1--source include/percona_query_cache_with_comments_clear.inc
2let $query=/* with comment first */select * from t1;
3eval $query;
4--source include/percona_query_cache_with_comments_eval.inc
5
6let $query=# with comment first
7select * from t1;
8--source include/percona_query_cache_with_comments_eval.inc
9
10let $query=-- with comment first
11select * from t1;
12--source include/percona_query_cache_with_comments_eval.inc
13
14let $query=/* with comment first and "quote" */select * from t1;
15--source include/percona_query_cache_with_comments_eval.inc
16
17let $query=# with comment first and "quote"
18select * from t1;
19--source include/percona_query_cache_with_comments_eval.inc
20
21let $query=-- with comment first and "quote"
22select * from t1;
23--source include/percona_query_cache_with_comments_eval.inc
24
25let $query=
26 /* with comment and whitespaces first */select * from t1;
27--source include/percona_query_cache_with_comments_eval.inc
28
29let $query=
30 # with comment and whitespaces first
31select * from t1;
32--source include/percona_query_cache_with_comments_eval.inc
33
34let $query=
35 -- with comment and whitespaces first
36select * from t1;
37--source include/percona_query_cache_with_comments_eval.inc
38
39let $internal=* internal comment *;
40
41let $query=select * /$internal/ from t1;
42--source include/percona_query_cache_with_comments_eval.inc
43let $query=select */$internal/ from t1;
44--source include/percona_query_cache_with_comments_eval.inc
45let $query=select */$internal/from t1;
46--source include/percona_query_cache_with_comments_eval.inc
47
48let $internal=* internal comment with "quote" *;
49
50let $query=select * /$internal/ from t1;
51--source include/percona_query_cache_with_comments_eval.inc
52let $query=select */$internal/ from t1;
53--source include/percona_query_cache_with_comments_eval.inc
54let $query=select */$internal/from t1;
55--source include/percona_query_cache_with_comments_eval.inc
56
57let $query=select * from t1
58;
59--source include/percona_query_cache_with_comments_eval.inc
60
61let $query=select * from t1 ;
62--source include/percona_query_cache_with_comments_eval.inc
63
64let $query=select * from t1 ;
65--source include/percona_query_cache_with_comments_eval.inc
66
67let $query=select * from t1
68/* comment in the end */;
69--source include/percona_query_cache_with_comments_eval.inc
70
71let $query=select * from t1
72/* *\/ */;
73--source include/percona_query_cache_with_comments_eval.inc
74
75let $query=select * from t1
76/* comment in the end */
77;
78--source include/percona_query_cache_with_comments_eval.inc
79
80let $query=select * from t1 #comment in the end;
81--source include/percona_query_cache_with_comments_eval.inc
82
83let $query=select * from t1 #comment in the end
84;
85--source include/percona_query_cache_with_comments_eval.inc
86
87let $query=select * from t1 -- comment in the end;
88--source include/percona_query_cache_with_comments_eval.inc
89
90let $query=select * from t1 -- comment in the end
91;
92--source include/percona_query_cache_with_comments_eval.inc
93
94let $query=select ' \' ' from t1;
95--source include/percona_query_cache_with_comments_eval.inc
960
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,12 @@
1-- source include/have_query_cache.inc
2
3set GLOBAL query_cache_size=1355776;
4
5--disable_warnings
6drop table if exists t1;
7--enable_warnings
8
9create table t1 (a int not null);
10insert into t1 values (1),(2),(3);
11
12--source include/percona_query_cache_with_comments_clear.inc
013
=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1-- source include/have_query_cache.inc
2
3set GLOBAL query_cache_size=1355776;
4
5--disable_warnings
6drop table if exists t1;
7--enable_warnings
8
9create table t1 (a int not null);
10insert into t1 values (1),(2),(3);
11
12--source include/percona_query_cache_with_comments_clear.inc
130
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,5 @@
1# Reset query cache variables.
2flush query cache; # This crashed in some versions
3flush query cache; # This crashed in some versions
4reset query cache;
5flush status;
06
=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1# Reset query cache variables.
2flush query cache; # This crashed in some versions
3flush query cache; # This crashed in some versions
4reset query cache;
5flush status;
60
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,3 @@
1DROP TABLE t1;
2SET GLOBAL query_cache_size=default;
3set global query_cache_strip_comments=OFF;
04
=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1DROP TABLE t1;
2SET GLOBAL query_cache_size=default;
3set global query_cache_strip_comments=OFF;
40
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,7 @@
1echo -----------------------------------------------------;
2echo $query;
3echo -----------------------------------------------------;
4--source include/percona_query_cache_with_comments_show.inc
5eval $query;
6eval $query;
7--source include/percona_query_cache_with_comments_show.inc
08
=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1echo -----------------------------------------------------;
2echo $query;
3echo -----------------------------------------------------;
4--source include/percona_query_cache_with_comments_show.inc
5eval $query;
6eval $query;
7--source include/percona_query_cache_with_comments_show.inc
80
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,8 @@
1let $show=show status like "Qcache_queries_in_cache";
2eval $show;
3let $show=show status like "Qcache_inserts";
4eval $show;
5let $show=show status like "Qcache_hits";
6eval $show;
7
8
09
=== removed file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1let $show=show status like "Qcache_queries_in_cache";
2eval $show;
3let $show=show status like "Qcache_inserts";
4eval $show;
5let $show=show status like "Qcache_hits";
6eval $show;
7
8
90
=== added file 'Percona-Server/mysql-test/include/percona_server_variables.inc'
--- Percona-Server/mysql-test/include/percona_server_variables.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_server_variables.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,3 @@
1--source include/have_response_time_distribution.inc
2--source include/have_innodb.inc
3SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
04
=== removed file 'Percona-Server/mysql-test/include/percona_server_variables.inc'
--- Percona-Server/mysql-test/include/percona_server_variables.inc 2012-04-18 23:26:11 +0000
+++ Percona-Server/mysql-test/include/percona_server_variables.inc 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1--source include/have_response_time_distribution.inc
2--source include/have_innodb.inc
3SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
40
=== added file 'Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc'
--- Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,56 @@
1--echo
2--disable_result_log
3connection slave_lock;
4--echo [slave_lock]
5send SHOW SLAVE STATUS;
6
7connection slave;
8--let $condition= 'SHOW SLAVE STATUS'
9--source include/wait_show_condition.inc
10
11--disable_warnings
12SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
13--enable_warnings
14
15--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
16--echo SIGNAL after SHOW SLAVE STATUS is $current
17
18connection slave;
19--echo [slave]
20SET DEBUG_SYNC='now SIGNAL signal.empty';
21
22connection slave_nolock;
23--echo [slave_nolock]
24send SHOW SLAVE STATUS NOLOCK;
25
26connection slave;
27--let $condition= 'SHOW SLAVE STATUS NOLOCK'
28--source include/wait_show_condition.inc
29
30--disable_warnings
31SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
32--enable_warnings
33
34--echo # should be 'signal.after_show_slave_status'
35--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
36--echo SIGNAL after SHOW SLAVE STATUS NOLOCK is $current
37
38connection slave;
39--echo [slave]
40SET DEBUG_SYNC='now SIGNAL signal.continue';
41
42connection slave_lock;
43--disable_result_log
44reap;
45--enable_result_log
46
47connection slave_nolock;
48--disable_result_log
49reap;
50--enable_result_log
51
52connection slave;
53--echo [slave]
54SET DEBUG_SYNC='now SIGNAL signal.empty';
55--enable_result_log
56--echo
057
=== removed file 'Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc'
--- Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 2012-04-18 23:25:57 +0000
+++ Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc 1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
1--echo
2--disable_result_log
3connection slave_lock;
4--echo [slave_lock]
5send SHOW SLAVE STATUS;
6
7connection slave;
8--let $condition= 'SHOW SLAVE STATUS'
9--source include/wait_show_condition.inc
10
11--disable_warnings
12SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
13--enable_warnings
14
15--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
16--echo SIGNAL after SHOW SLAVE STATUS is $current
17
18connection slave;
19--echo [slave]
20SET DEBUG_SYNC='now SIGNAL signal.empty';
21
22connection slave_nolock;
23--echo [slave_nolock]
24send SHOW SLAVE STATUS NOLOCK;
25
26connection slave;
27--let $condition= 'SHOW SLAVE STATUS NOLOCK'
28--source include/wait_show_condition.inc
29
30--disable_warnings
31SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
32--enable_warnings
33
34--echo # should be 'signal.after_show_slave_status'
35--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
36--echo SIGNAL after SHOW SLAVE STATUS NOLOCK is $current
37
38connection slave;
39--echo [slave]
40SET DEBUG_SYNC='now SIGNAL signal.continue';
41
42connection slave_lock;
43--disable_result_log
44reap;
45--enable_result_log
46
47connection slave_nolock;
48--disable_result_log
49reap;
50--enable_result_log
51
52connection slave;
53--echo [slave]
54SET DEBUG_SYNC='now SIGNAL signal.empty';
55--enable_result_log
56--echo
570
=== added file 'Percona-Server/mysql-test/include/query_response_time-replication.inc'
--- Percona-Server/mysql-test/include/query_response_time-replication.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/query_response_time-replication.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,58 @@
1connection master;
2
3CREATE TABLE t(id INT);
4
5sync_slave_with_master;
6
7SET GLOBAL query_exec_time = 0.1;
8--source include/restart_slave_sql.inc
9
10connection slave;
11
12SET SESSION query_exec_time=0.1;
13
14SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
15--eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base
16FLUSH QUERY_RESPONSE_TIME;
17SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
18
19connection master;
20
21SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1);
22SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1);
23SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1);
24SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1);
25SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1);
26SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1);
27SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1);
28SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1);
29SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1);
30SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1);
31SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1);
32SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1);
33SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1);
34SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1);
35SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1);
36SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1);
37SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1);
38SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1);
39SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1);
40SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1);
41SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1);
42SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1);
43
44sync_slave_with_master;
45
46connection slave;
47SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
48SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
49SHOW QUERY_RESPONSE_TIME;
50SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
51
52SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
53SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
54
55connection master;
56DROP TABLE t;
57
58sync_slave_with_master;
059
=== removed file 'Percona-Server/mysql-test/include/query_response_time-replication.inc'
--- Percona-Server/mysql-test/include/query_response_time-replication.inc 2013-01-28 11:28:44 +0000
+++ Percona-Server/mysql-test/include/query_response_time-replication.inc 1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
1connection master;
2
3CREATE TABLE t(id INT);
4
5sync_slave_with_master;
6
7SET GLOBAL query_exec_time = 0.1;
8--source include/restart_slave_sql.inc
9
10connection slave;
11
12SET SESSION query_exec_time=0.1;
13
14SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
15--eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base
16FLUSH QUERY_RESPONSE_TIME;
17SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
18
19connection master;
20
21SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1);
22SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1);
23SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1);
24SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1);
25SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1);
26SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1);
27SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1);
28SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1);
29SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1);
30SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1);
31SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1);
32SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1);
33SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1);
34SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1);
35SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1);
36SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1);
37SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1);
38SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1);
39SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1);
40SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1);
41SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1);
42SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1);
43
44sync_slave_with_master;
45
46connection slave;
47SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
48SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
49SHOW QUERY_RESPONSE_TIME;
50SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
51
52SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
53SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
54
55connection master;
56DROP TABLE t;
57
58sync_slave_with_master;
590
=== added file 'Percona-Server/mysql-test/include/query_response_time-stored.inc'
--- Percona-Server/mysql-test/include/query_response_time-stored.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/query_response_time-stored.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,37 @@
1SET SESSION query_exec_time=0.1;
2
3SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
4EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
5FLUSH QUERY_RESPONSE_TIME;
6SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
7
8CALL test_f(0.31);
9CALL test_f(0.32);
10CALL test_f(0.33);
11CALL test_f(0.34);
12CALL test_f(0.35);
13CALL test_f(0.36);
14CALL test_f(0.37);
15CALL test_f(0.38);
16CALL test_f(0.39);
17CALL test_f(0.4);
18CALL test_f(1.1);
19CALL test_f(1.2);
20CALL test_f(1.3);
21CALL test_f(1.5);
22CALL test_f(1.4);
23CALL test_f(0.5);
24CALL test_f(2.1);
25CALL test_f(2.3);
26CALL test_f(2.5);
27CALL test_f(3.1);
28CALL test_f(4.1);
29CALL test_f(5.1);
30
31SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
32
33SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
34SHOW QUERY_RESPONSE_TIME;
35SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
36
37SET SESSION query_exec_time=default;
038
=== removed file 'Percona-Server/mysql-test/include/query_response_time-stored.inc'
--- Percona-Server/mysql-test/include/query_response_time-stored.inc 2012-04-18 23:25:50 +0000
+++ Percona-Server/mysql-test/include/query_response_time-stored.inc 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
1SET SESSION query_exec_time=0.1;
2
3SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
4EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
5FLUSH QUERY_RESPONSE_TIME;
6SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
7
8CALL test_f(0.31);
9CALL test_f(0.32);
10CALL test_f(0.33);
11CALL test_f(0.34);
12CALL test_f(0.35);
13CALL test_f(0.36);
14CALL test_f(0.37);
15CALL test_f(0.38);
16CALL test_f(0.39);
17CALL test_f(0.4);
18CALL test_f(1.1);
19CALL test_f(1.2);
20CALL test_f(1.3);
21CALL test_f(1.5);
22CALL test_f(1.4);
23CALL test_f(0.5);
24CALL test_f(2.1);
25CALL test_f(2.3);
26CALL test_f(2.5);
27CALL test_f(3.1);
28CALL test_f(4.1);
29CALL test_f(5.1);
30
31SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
32
33SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
34SHOW QUERY_RESPONSE_TIME;
35SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
36
37SET SESSION query_exec_time=default;
380
=== added file 'Percona-Server/mysql-test/include/query_response_time.inc'
--- Percona-Server/mysql-test/include/query_response_time.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/query_response_time.inc 2013-05-26 07:24:39 +0000
@@ -0,0 +1,43 @@
1SET SESSION query_exec_time=0.1;
2
3SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
4EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
5FLUSH QUERY_RESPONSE_TIME;
6# Following two queries check works of FLUSH and
7# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312)
8SHOW QUERY_RESPONSE_TIME;
9SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
10SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
11
12SET SESSION query_exec_time=0.31; SELECT 1;
13SET SESSION query_exec_time=0.32; SELECT 1;
14SET SESSION query_exec_time=0.33; SELECT 1;
15SET SESSION query_exec_time=0.34; SELECT 1;
16SET SESSION query_exec_time=0.35; SELECT 1;
17SET SESSION query_exec_time=0.36; SELECT 1;
18SET SESSION query_exec_time=0.37; SELECT 1;
19SET SESSION query_exec_time=0.38; SELECT 1;
20SET SESSION query_exec_time=0.39; SELECT 1;
21SET SESSION query_exec_time=0.4; SELECT 1;
22SET SESSION query_exec_time=1.1; SELECT 1;
23SET SESSION query_exec_time=1.2; SELECT 1;
24SET SESSION query_exec_time=1.3; SELECT 1;
25SET SESSION query_exec_time=1.5; SELECT 1;
26SET SESSION query_exec_time=1.4; SELECT 1;
27SET SESSION query_exec_time=0.5; SELECT 1;
28SET SESSION query_exec_time=2.1; SELECT 1;
29SET SESSION query_exec_time=2.3; SELECT 1;
30SET SESSION query_exec_time=2.5; SELECT 1;
31SET SESSION query_exec_time=3.1; SELECT 1;
32SET SESSION query_exec_time=4.1; SELECT 1;
33SET SESSION query_exec_time=5.1; SELECT 1;
34
35SET SESSION query_exec_time=0.1;
36
37SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
38
39SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
40SHOW QUERY_RESPONSE_TIME;
41SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
42
43SET SESSION query_exec_time=default;
044
=== removed file 'Percona-Server/mysql-test/include/query_response_time.inc'
--- Percona-Server/mysql-test/include/query_response_time.inc 2012-04-18 23:25:50 +0000
+++ Percona-Server/mysql-test/include/query_response_time.inc 1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
1SET SESSION query_exec_time=0.1;
2
3SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
4EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
5FLUSH QUERY_RESPONSE_TIME;
6# Following two queries check works of FLUSH and
7# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312)
8SHOW QUERY_RESPONSE_TIME;
9SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
10SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
11
12SET SESSION query_exec_time=0.31; SELECT 1;
13SET SESSION query_exec_time=0.32; SELECT 1;
14SET SESSION query_exec_time=0.33; SELECT 1;
15SET SESSION query_exec_time=0.34; SELECT 1;
16SET SESSION query_exec_time=0.35; SELECT 1;
17SET SESSION query_exec_time=0.36; SELECT 1;
18SET SESSION query_exec_time=0.37; SELECT 1;
19SET SESSION query_exec_time=0.38; SELECT 1;
20SET SESSION query_exec_time=0.39; SELECT 1;
21SET SESSION query_exec_time=0.4; SELECT 1;
22SET SESSION query_exec_time=1.1; SELECT 1;
23SET SESSION query_exec_time=1.2; SELECT 1;
24SET SESSION query_exec_time=1.3; SELECT 1;
25SET SESSION query_exec_time=1.5; SELECT 1;
26SET SESSION query_exec_time=1.4; SELECT 1;
27SET SESSION query_exec_time=0.5; SELECT 1;
28SET SESSION query_exec_time=2.1; SELECT 1;
29SET SESSION query_exec_time=2.3; SELECT 1;
30SET SESSION query_exec_time=2.5; SELECT 1;
31SET SESSION query_exec_time=3.1; SELECT 1;
32SET SESSION query_exec_time=4.1; SELECT 1;
33SET SESSION query_exec_time=5.1; SELECT 1;
34
35SET SESSION query_exec_time=0.1;
36
37SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
38
39SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
40SHOW QUERY_RESPONSE_TIME;
41SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
42
43SET SESSION query_exec_time=default;
440
=== added file 'Percona-Server/mysql-test/lib/Subunit.pm'
--- Percona-Server/mysql-test/lib/Subunit.pm 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/lib/Subunit.pm 2013-05-26 07:24:39 +0000
@@ -0,0 +1,94 @@
1# Perl module for parsing and generating the Subunit protocol
2# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3#
4# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
5# license at the users choice. A copy of both licenses are available in the
6# project source as Apache-2.0 and BSD. You may not use this file except in
7# compliance with one of these two licences.
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# license you chose for the specific language governing permissions and
13# limitations under that license.
14
15package Subunit;
16use POSIX;
17
18use vars qw ( $VERSION );
19
20$VERSION = '0.0.2';
21
22use strict;
23my $SUBUNIT_OUT= 'test_results.subunit';
24# reset the file
25open(SUBUNITOUT, ">$SUBUNIT_OUT");
26close(SUBUNITOUT);
27
28sub subunit_start_test($)
29{
30 my ($testname) = @_;
31 open(SUBUNITOUT, ">>$SUBUNIT_OUT");
32 print SUBUNITOUT "test: $testname\n";
33 close(SUBUNITOUT);
34 return;
35}
36
37sub subunit_end_test($$;$)
38{
39 my $name = shift;
40 my $result = shift;
41 my $reason = shift;
42 open(SUBUNITOUT, ">>$SUBUNIT_OUT");
43 if ($reason) {
44 print SUBUNITOUT "$result: $name [\n";
45 print SUBUNITOUT "$reason\n";
46 print SUBUNITOUT "]\n";
47 } else {
48 print SUBUNITOUT "$result: $name\n";
49 }
50 close(SUBUNITOUT);
51 return;
52}
53
54sub subunit_skip_test($;$)
55{
56 my $name = shift;
57 my $reason = shift;
58 subunit_end_test($name, "skip", $reason);
59}
60
61sub subunit_fail_test($;$)
62{
63 my $name = shift;
64 my $reason = shift;
65 subunit_end_test($name, "failure", $reason);
66}
67
68sub subunit_pass_test($;$)
69{
70 my $name = shift;
71 my $reason = shift;
72 subunit_end_test($name, "success", $reason);
73}
74
75sub subunit_xfail_test($;$)
76{
77 my $name = shift;
78 my $reason = shift;
79 subunit_end_test($name, "xfail", $reason);
80}
81
82sub report_time($)
83{
84 my ($time) = @_;
85 my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
86 open(SUBUNITOUT, ">>$SUBUNIT_OUT");
87 printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, ($mon+1), $mday, $hour, $min, $sec;
88 close(SUBUNITOUT);
89 return;
90}
91
92
93
941;
095
=== removed file 'Percona-Server/mysql-test/lib/Subunit.pm'
--- Percona-Server/mysql-test/lib/Subunit.pm 2012-04-18 23:26:32 +0000
+++ Percona-Server/mysql-test/lib/Subunit.pm 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
1# Perl module for parsing and generating the Subunit protocol
2# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3#
4# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
5# license at the users choice. A copy of both licenses are available in the
6# project source as Apache-2.0 and BSD. You may not use this file except in
7# compliance with one of these two licences.
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# license you chose for the specific language governing permissions and
13# limitations under that license.
14
15package Subunit;
16use POSIX;
17
18use vars qw ( $VERSION );
19
20$VERSION = '0.0.2';
21
22use strict;
23my $SUBUNIT_OUT= 'test_results.subunit';
24# reset the file
25open(SUBUNITOUT, ">$SUBUNIT_OUT");
26close(SUBUNITOUT);
27
28sub subunit_start_test($)
29{
30 my ($testname) = @_;
31 open(SUBUNITOUT, ">>$SUBUNIT_OUT");
32 print SUBUNITOUT "test: $testname\n";
33 close(SUBUNITOUT);
34 return;
35}
36
37sub subunit_end_test($$;$)
38{
39 my $name = shift;
40 my $result = shift;
41 my $reason = shift;
42 open(SUBUNITOUT, ">>$SUBUNIT_OUT");
43 if ($reason) {
44 print SUBUNITOUT "$result: $name [\n";
45 print SUBUNITOUT "$reason\n";
46 print SUBUNITOUT "]\n";
47 } else {
48 print SUBUNITOUT "$result: $name\n";
49 }
50 close(SUBUNITOUT);
51 return;
52}
53
54sub subunit_skip_test($;$)
55{
56 my $name = shift;
57 my $reason = shift;
58 subunit_end_test($name, "skip", $reason);
59}
60
61sub subunit_fail_test($;$)
62{
63 my $name = shift;
64 my $reason = shift;
65 subunit_end_test($name, "failure", $reason);
66}
67
68sub subunit_pass_test($;$)
69{
70 my $name = shift;
71 my $reason = shift;
72 subunit_end_test($name, "success", $reason);
73}
74
75sub subunit_xfail_test($;$)
76{
77 my $name = shift;
78 my $reason = shift;
79 subunit_end_test($name, "xfail", $reason);
80}
81
82sub report_time($)
83{
84 my ($time) = @_;
85 my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
86 open(SUBUNITOUT, ">>$SUBUNIT_OUT");
87 printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, ($mon+1), $mday, $hour, $min, $sec;
88 close(SUBUNITOUT);
89 return;
90}
91
92
93
941;
950
=== added file 'Percona-Server/mysql-test/r/have_response_time_distribution.require'
--- Percona-Server/mysql-test/r/have_response_time_distribution.require 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/have_response_time_distribution.require 2013-05-26 07:24:39 +0000
@@ -0,0 +1,2 @@
1Variable_name Value
2have_response_time_distribution YES
03
=== removed file 'Percona-Server/mysql-test/r/have_response_time_distribution.require'
--- Percona-Server/mysql-test/r/have_response_time_distribution.require 2012-04-18 23:25:50 +0000
+++ Percona-Server/mysql-test/r/have_response_time_distribution.require 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1Variable_name Value
2have_response_time_distribution YES
30
=== added file 'Percona-Server/mysql-test/r/percona_bug45702.result'
--- Percona-Server/mysql-test/r/percona_bug45702.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug45702.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,21 @@
1CREATE TABLE t1 (a BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM;
2INSERT INTO t1 VALUES (), (), (), (), (), (), (), ();
3INSERT INTO t1 SELECT NULL FROM t1;
4INSERT INTO t1 SELECT NULL FROM t1;
5INSERT INTO t1 SELECT NULL FROM t1;
6INSERT INTO t1 SELECT NULL FROM t1;
7INSERT INTO t1 SELECT NULL FROM t1;
8INSERT INTO t1 SELECT NULL FROM t1;
9INSERT INTO t1 SELECT NULL FROM t1;
10INSERT INTO t1 SELECT NULL FROM t1;
11INSERT INTO t1 SELECT NULL FROM t1;
12SET @old_myisam_sort_buffer_size = @@myisam_sort_buffer_size;
13SET @@myisam_sort_buffer_size = 4 * 1024 * 1024 * 1024;
14REPAIR TABLE t1;
15Table Op Msg_type Msg_text
16test.t1 repair status OK
17- recovering (with sort) MyISAM-table 'MYSQLD_DATADIR/test/t1'
18Data records: 4096
19- Fixing index 1
20SET @@myisam_sort_buffer_size = @old_myisam_sort_buffer_size;
21DROP TABLE t1;
022
=== removed file 'Percona-Server/mysql-test/r/percona_bug45702.result'
--- Percona-Server/mysql-test/r/percona_bug45702.result 2012-04-18 23:26:36 +0000
+++ Percona-Server/mysql-test/r/percona_bug45702.result 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1CREATE TABLE t1 (a BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM;
2INSERT INTO t1 VALUES (), (), (), (), (), (), (), ();
3INSERT INTO t1 SELECT NULL FROM t1;
4INSERT INTO t1 SELECT NULL FROM t1;
5INSERT INTO t1 SELECT NULL FROM t1;
6INSERT INTO t1 SELECT NULL FROM t1;
7INSERT INTO t1 SELECT NULL FROM t1;
8INSERT INTO t1 SELECT NULL FROM t1;
9INSERT INTO t1 SELECT NULL FROM t1;
10INSERT INTO t1 SELECT NULL FROM t1;
11INSERT INTO t1 SELECT NULL FROM t1;
12SET @old_myisam_sort_buffer_size = @@myisam_sort_buffer_size;
13SET @@myisam_sort_buffer_size = 4 * 1024 * 1024 * 1024;
14REPAIR TABLE t1;
15Table Op Msg_type Msg_text
16test.t1 repair status OK
17- recovering (with sort) MyISAM-table 'MYSQLD_DATADIR/test/t1'
18Data records: 4096
19- Fixing index 1
20SET @@myisam_sort_buffer_size = @old_myisam_sort_buffer_size;
21DROP TABLE t1;
220
=== added file 'Percona-Server/mysql-test/r/percona_bug933969.result'
--- Percona-Server/mysql-test/r/percona_bug933969.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug933969.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,16 @@
1RESET MASTER;
2DROP TABLE IF EXISTS t1;
3CREATE TABLE t1 (word VARCHAR(20));
4INSERT INTO t1 VALUES ("hamite");
5INSERT INTO t1 VALUES ("hoho");
6INSERT INTO t1 VALUES ("znamenito");
7INSERT INTO t1 VALUES ("mrachny");
8INSERT INTO t1 VALUES ("mrak");
9INSERT INTO t1 VALUES ("zhut");
10INSERT INTO t1 VALUES ("parnisha");
11INSERT INTO t1 VALUES ("krrasota!");
12INSERT INTO t1 VALUES ("podumayesh");
13INSERT INTO t1 VALUES ("ogo!");
14FLUSH LOGS;
15DROP TABLE t1;
16RESET MASTER;
017
=== removed file 'Percona-Server/mysql-test/r/percona_bug933969.result'
--- Percona-Server/mysql-test/r/percona_bug933969.result 2012-04-18 23:24:34 +0000
+++ Percona-Server/mysql-test/r/percona_bug933969.result 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1RESET MASTER;
2DROP TABLE IF EXISTS t1;
3CREATE TABLE t1 (word VARCHAR(20));
4INSERT INTO t1 VALUES ("hamite");
5INSERT INTO t1 VALUES ("hoho");
6INSERT INTO t1 VALUES ("znamenito");
7INSERT INTO t1 VALUES ("mrachny");
8INSERT INTO t1 VALUES ("mrak");
9INSERT INTO t1 VALUES ("zhut");
10INSERT INTO t1 VALUES ("parnisha");
11INSERT INTO t1 VALUES ("krrasota!");
12INSERT INTO t1 VALUES ("podumayesh");
13INSERT INTO t1 VALUES ("ogo!");
14FLUSH LOGS;
15DROP TABLE t1;
16RESET MASTER;
170
=== added file 'Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result'
--- Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,4 @@
1show variables like 'innodb_buffer_pool_shm%';
2Variable_name Value
3innodb_buffer_pool_shm_checksum ON
4innodb_buffer_pool_shm_key 123456
05
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result'
--- Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 2012-04-18 23:25:30 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1show variables like 'innodb_buffer_pool_shm%';
2Variable_name Value
3innodb_buffer_pool_shm_checksum ON
4innodb_buffer_pool_shm_key 123456
50
=== added file 'Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result'
--- Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,28 @@
1# Establish connection con1 (user=root)
2# Establish connection con2 (user=root)
3# Establish connection con3 (user=root)
4# Drop test table
5drop table if exists t;
6# Create test table
7create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
8# Insert two rows to test table
9insert into t values(2,1);
10insert into t values(1,2);
11# Switch to connection con1
12BEGIN;
13SELECT b FROM t WHERE a=1 FOR UPDATE;
14# Switch to connection con2
15BEGIN;
16SELECT b FROM t WHERE a=2 FOR UPDATE;
17# Switch to connection con1
18SELECT b FROM t WHERE a=2 FOR UPDATE;
19# Switch to connection con2
20SELECT b FROM t WHERE a=1 FOR UPDATE;
21# Switch to connection con1
22ROLLBACK;
23# Switch to connection con2
24ROLLBACK;
25# Switch to connection con3
26Deadlocks: 1
27# Drop test table
28drop table t;
029
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result'
--- Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 2012-04-18 23:25:25 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
1# Establish connection con1 (user=root)
2# Establish connection con2 (user=root)
3# Establish connection con3 (user=root)
4# Drop test table
5drop table if exists t;
6# Create test table
7create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
8# Insert two rows to test table
9insert into t values(2,1);
10insert into t values(1,2);
11# Switch to connection con1
12BEGIN;
13SELECT b FROM t WHERE a=1 FOR UPDATE;
14# Switch to connection con2
15BEGIN;
16SELECT b FROM t WHERE a=2 FOR UPDATE;
17# Switch to connection con1
18SELECT b FROM t WHERE a=2 FOR UPDATE;
19# Switch to connection con2
20SELECT b FROM t WHERE a=1 FOR UPDATE;
21# Switch to connection con1
22ROLLBACK;
23# Switch to connection con2
24ROLLBACK;
25# Switch to connection con3
26Deadlocks: 1
27# Drop test table
28drop table t;
290
=== added file 'Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result'
--- Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,4 @@
1show variables like 'innodb_doublewrite%';
2Variable_name Value
3innodb_doublewrite ON
4innodb_doublewrite_file ib_doublewrite
05
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result'
--- Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 2012-04-18 23:25:15 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1show variables like 'innodb_doublewrite%';
2Variable_name Value
3innodb_doublewrite ON
4innodb_doublewrite_file ib_doublewrite
50
=== added file 'Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result'
--- Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,64 @@
1CREATE TABLE t1(
2id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
3a CHAR(1) NOT NULL,
4b CHAR(36) NOT NULL) ENGINE=InnoDB;
5INSERT INTO t1(a,b) VALUES ('a','b');
6INSERT INTO t1(a,b) SELECT a,b FROM t1;
7INSERT INTO t1(a,b) SELECT a,b FROM t1;
8INSERT INTO t1(a,b) SELECT a,b FROM t1;
9INSERT INTO t1(a,b) SELECT a,b FROM t1;
10ALTER TABLE t1 ADD KEY (a);
11affected rows: 0
12info: Records: 0 Duplicates: 0 Warnings: 0
13EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
14id 1
15select_type SIMPLE
16table t1
17type ALL
18possible_keys a
19key NULL
20key_len NULL
21ref NULL
22rows 16
23Extra
24id 1
25select_type SIMPLE
26table t2
27type ref
28possible_keys a
29key a
30key_len 1
31ref test.t1.a
32rows 1
33Extra Using where
34ALTER TABLE t1 DROP KEY a;
35SET expand_fast_index_creation = 1;
36SELECT @@expand_fast_index_creation;
37@@expand_fast_index_creation
381
39ALTER TABLE t1 ADD KEY (a);
40affected rows: 0
41info: Records: 0 Duplicates: 0 Warnings: 0
42EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
43id 1
44select_type SIMPLE
45table t1
46type ALL
47possible_keys a
48key NULL
49key_len NULL
50ref NULL
51rows 16
52Extra
53id 1
54select_type SIMPLE
55table t2
56type ALL
57possible_keys a
58key NULL
59key_len NULL
60ref NULL
61rows 16
62Extra Using where; Using join buffer
63SET expand_fast_index_creation = 0;
64DROP TABLE t1;
065
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result'
--- Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 2012-04-18 23:26:09 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result 1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
1CREATE TABLE t1(
2id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
3a CHAR(1) NOT NULL,
4b CHAR(36) NOT NULL) ENGINE=InnoDB;
5INSERT INTO t1(a,b) VALUES ('a','b');
6INSERT INTO t1(a,b) SELECT a,b FROM t1;
7INSERT INTO t1(a,b) SELECT a,b FROM t1;
8INSERT INTO t1(a,b) SELECT a,b FROM t1;
9INSERT INTO t1(a,b) SELECT a,b FROM t1;
10ALTER TABLE t1 ADD KEY (a);
11affected rows: 0
12info: Records: 0 Duplicates: 0 Warnings: 0
13EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
14id 1
15select_type SIMPLE
16table t1
17type ALL
18possible_keys a
19key NULL
20key_len NULL
21ref NULL
22rows 16
23Extra
24id 1
25select_type SIMPLE
26table t2
27type ref
28possible_keys a
29key a
30key_len 1
31ref test.t1.a
32rows 1
33Extra Using where
34ALTER TABLE t1 DROP KEY a;
35SET expand_fast_index_creation = 1;
36SELECT @@expand_fast_index_creation;
37@@expand_fast_index_creation
381
39ALTER TABLE t1 ADD KEY (a);
40affected rows: 0
41info: Records: 0 Duplicates: 0 Warnings: 0
42EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
43id 1
44select_type SIMPLE
45table t1
46type ALL
47possible_keys a
48key NULL
49key_len NULL
50ref NULL
51rows 16
52Extra
53id 1
54select_type SIMPLE
55table t2
56type ALL
57possible_keys a
58key NULL
59key_len NULL
60ref NULL
61rows 16
62Extra Using where; Using join buffer
63SET expand_fast_index_creation = 0;
64DROP TABLE t1;
650
=== added file 'Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result'
--- Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,3 @@
1show variables like 'innodb_use_sys_stats%';
2Variable_name Value
3innodb_use_sys_stats_table ON
04
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result'
--- Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 2012-04-18 23:25:04 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1show variables like 'innodb_use_sys_stats%';
2Variable_name Value
3innodb_use_sys_stats_table ON
40
=== added file 'Percona-Server/mysql-test/r/percona_innodb_version.result'
--- Percona-Server/mysql-test/r/percona_innodb_version.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_version.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,3 @@
1SELECT @@innodb_version;
2@@innodb_version
35.5.x-x.x
04
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_version.result'
--- Percona-Server/mysql-test/r/percona_innodb_version.result 2013-02-18 04:48:10 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_version.result 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1SELECT @@innodb_version;
2@@innodb_version
35.5.x-x.x
40
=== added file 'Percona-Server/mysql-test/r/percona_log_connection_error.result'
--- Percona-Server/mysql-test/r/percona_log_connection_error.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_connection_error.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,16 @@
1SET @old_max_connections = @@max_connections;
2SET @old_log_warnings = @@log_warnings;
3SET GLOBAL max_connections=2;
4SET GLOBAL LOG_WARNINGS = 0;
5connect(localhost,root,,test,port,socket);
6ERROR HY000: Too many connections
7SET GLOBAL LOG_WARNINGS = 1;
8connect(localhost,root,,test,port,socket);
9ERROR HY000: Too many connections
10SET GLOBAL LOG_WARNINGS = 0;
11connect(localhost,root,,test,port,socket);
12ERROR HY000: Too many connections
13SET GLOBAL max_connections = @old_max_connections;
14SET GLOBAL log_warnings = @old_log_warnings;
15[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
16[log_grep.inc] lines: 1
017
=== removed file 'Percona-Server/mysql-test/r/percona_log_connection_error.result'
--- Percona-Server/mysql-test/r/percona_log_connection_error.result 2012-04-18 23:25:45 +0000
+++ Percona-Server/mysql-test/r/percona_log_connection_error.result 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1SET @old_max_connections = @@max_connections;
2SET @old_log_warnings = @@log_warnings;
3SET GLOBAL max_connections=2;
4SET GLOBAL LOG_WARNINGS = 0;
5connect(localhost,root,,test,port,socket);
6ERROR HY000: Too many connections
7SET GLOBAL LOG_WARNINGS = 1;
8connect(localhost,root,,test,port,socket);
9ERROR HY000: Too many connections
10SET GLOBAL LOG_WARNINGS = 0;
11connect(localhost,root,,test,port,socket);
12ERROR HY000: Too many connections
13SET GLOBAL max_connections = @old_max_connections;
14SET GLOBAL log_warnings = @old_log_warnings;
15[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
16[log_grep.inc] lines: 1
170
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2Variable_name Value
3log_slow_admin_statements ON
4SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
5VARIABLE_NAME VARIABLE_VALUE
6LOG_SLOW_ADMIN_STATEMENTS ON
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2Variable_name Value
3log_slow_admin_statements ON
4SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
5VARIABLE_NAME VARIABLE_VALUE
6LOG_SLOW_ADMIN_STATEMENTS ON
70
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2Variable_name Value
3log_slow_admin_statements OFF
4SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
5VARIABLE_NAME VARIABLE_VALUE
6LOG_SLOW_ADMIN_STATEMENTS OFF
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2Variable_name Value
3log_slow_admin_statements OFF
4SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
5VARIABLE_NAME VARIABLE_VALUE
6LOG_SLOW_ADMIN_STATEMENTS OFF
70
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,7 @@
1call mtr.add_suppression("option 'log_slow_admin_statements': boolean value 'foo' wasn't recognized. Set to OFF.");
2SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
3Variable_name Value
4log_slow_admin_statements OFF
5SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
6VARIABLE_NAME VARIABLE_VALUE
7LOG_SLOW_ADMIN_STATEMENTS OFF
08
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1call mtr.add_suppression("option 'log_slow_admin_statements': boolean value 'foo' wasn't recognized. Set to OFF.");
2SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
3Variable_name Value
4log_slow_admin_statements OFF
5SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
6VARIABLE_NAME VARIABLE_VALUE
7LOG_SLOW_ADMIN_STATEMENTS OFF
80
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2Variable_name Value
3log_slow_admin_statements ON
4SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
5VARIABLE_NAME VARIABLE_VALUE
6LOG_SLOW_ADMIN_STATEMENTS ON
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2Variable_name Value
3log_slow_admin_statements ON
4SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
5VARIABLE_NAME VARIABLE_VALUE
6LOG_SLOW_ADMIN_STATEMENTS ON
70
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'log_slow_filter';
2Variable_name Value
3log_slow_filter full_join
4SHOW GLOBAL VARIABLES LIKE 'log_slow_filter';
5Variable_name Value
6log_slow_filter full_join
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW VARIABLES LIKE 'log_slow_filter';
2Variable_name Value
3log_slow_filter full_join
4SHOW GLOBAL VARIABLES LIKE 'log_slow_filter';
5Variable_name Value
6log_slow_filter full_join
70
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'log_slow_slave_statements';
2Variable_name Value
3log_slow_slave_statements ON
4SHOW GLOBAL VARIABLES LIKE 'log_slow_slave_statements';
5Variable_name Value
6log_slow_slave_statements ON
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW VARIABLES LIKE 'log_slow_slave_statements';
2Variable_name Value
3log_slow_slave_statements ON
4SHOW GLOBAL VARIABLES LIKE 'log_slow_slave_statements';
5Variable_name Value
6log_slow_slave_statements ON
70
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'log_slow_sp_statements';
2Variable_name Value
3log_slow_sp_statements ON
4SHOW GLOBAL VARIABLES LIKE 'log_slow_sp_statements';
5Variable_name Value
6log_slow_sp_statements ON
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW VARIABLES LIKE 'log_slow_sp_statements';
2Variable_name Value
3log_slow_sp_statements ON
4SHOW GLOBAL VARIABLES LIKE 'log_slow_sp_statements';
5Variable_name Value
6log_slow_sp_statements ON
70
=== added file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'log_slow_verbosity';
2Variable_name Value
3log_slow_verbosity microtime,query_plan,innodb
4SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
5Variable_name Value
6log_slow_verbosity microtime,query_plan,innodb
07
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result'
--- Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 2012-04-18 23:25:38 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1SHOW VARIABLES LIKE 'log_slow_verbosity';
2Variable_name Value
3log_slow_verbosity microtime,query_plan,innodb
4SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
5Variable_name Value
6log_slow_verbosity microtime,query_plan,innodb
70
=== added file 'Percona-Server/mysql-test/r/percona_min_examined_row_limit.result'
--- Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,35 @@
1drop table if exists t;
2create table t(id INT PRIMARY KEY);
3insert into t values(1);
4insert into t values(2);
5insert into t values(3);
6SET GLOBAL long_query_time=2;
7SET GLOBAL slow_query_log_use_global_control='long_query_time,min_examined_row_limit';
8[log_start.inc] percona.slow_extended.min_examined_row_limit
9SET SESSION query_exec_time=2.1;
10SELECT 1;
111
121
13SET GLOBAL min_examined_row_limit=5;
14SELECT * FROM t AS t1, t AS t2;
15id id
161 1
172 1
183 1
191 2
202 2
213 2
221 3
232 3
243 3
25SELECT 1;
261
271
28SET SESSION query_exec_time=default;
29[log_stop.inc] percona.slow_extended.min_examined_row_limit
30SET GLOBAL min_examined_row_limit=default;
31SET GLOBAL slow_query_log_use_global_control=default;
32SET GLOBAL long_query_time=default;
33[log_grep.inc] file: percona.slow_extended.min_examined_row_limit pattern: Query_time
34[log_grep.inc] lines: 1
35DROP TABLE t;
036
=== removed file 'Percona-Server/mysql-test/r/percona_min_examined_row_limit.result'
--- Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 2013-01-20 13:26:51 +0000
+++ Percona-Server/mysql-test/r/percona_min_examined_row_limit.result 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
1drop table if exists t;
2create table t(id INT PRIMARY KEY);
3insert into t values(1);
4insert into t values(2);
5insert into t values(3);
6SET GLOBAL long_query_time=2;
7SET GLOBAL slow_query_log_use_global_control='long_query_time,min_examined_row_limit';
8[log_start.inc] percona.slow_extended.min_examined_row_limit
9SET SESSION query_exec_time=2.1;
10SELECT 1;
111
121
13SET GLOBAL min_examined_row_limit=5;
14SELECT * FROM t AS t1, t AS t2;
15id id
161 1
172 1
183 1
191 2
202 2
213 2
221 3
232 3
243 3
25SELECT 1;
261
271
28SET SESSION query_exec_time=default;
29[log_stop.inc] percona.slow_extended.min_examined_row_limit
30SET GLOBAL min_examined_row_limit=default;
31SET GLOBAL slow_query_log_use_global_control=default;
32SET GLOBAL long_query_time=default;
33[log_grep.inc] file: percona.slow_extended.min_examined_row_limit pattern: Query_time
34[log_grep.inc] lines: 1
35DROP TABLE t;
360
=== added file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,866 @@
1set global query_cache_strip_comments=ON;
2set GLOBAL query_cache_size=1355776;
3drop table if exists t1;
4create table t1 (a int not null);
5insert into t1 values (1),(2),(3);
6flush query cache;
7flush query cache;
8reset query cache;
9flush status;
10flush query cache;
11flush query cache;
12reset query cache;
13flush status;
14/* with comment first */select * from t1;
15a
161
172
183
19-----------------------------------------------------
20/* with comment first */select * from t1
21-----------------------------------------------------
22show status like "Qcache_queries_in_cache";
23Variable_name Value
24Qcache_queries_in_cache 1
25show status like "Qcache_inserts";
26Variable_name Value
27Qcache_inserts 1
28show status like "Qcache_hits";
29Variable_name Value
30Qcache_hits 0
31/* with comment first */select * from t1;
32a
331
342
353
36/* with comment first */select * from t1;
37a
381
392
403
41show status like "Qcache_queries_in_cache";
42Variable_name Value
43Qcache_queries_in_cache 1
44show status like "Qcache_inserts";
45Variable_name Value
46Qcache_inserts 1
47show status like "Qcache_hits";
48Variable_name Value
49Qcache_hits 2
50-----------------------------------------------------
51# with comment first
52select * from t1
53-----------------------------------------------------
54show status like "Qcache_queries_in_cache";
55Variable_name Value
56Qcache_queries_in_cache 1
57show status like "Qcache_inserts";
58Variable_name Value
59Qcache_inserts 1
60show status like "Qcache_hits";
61Variable_name Value
62Qcache_hits 2
63# with comment first
64select * from t1;
65a
661
672
683
69# with comment first
70select * from t1;
71a
721
732
743
75show status like "Qcache_queries_in_cache";
76Variable_name Value
77Qcache_queries_in_cache 1
78show status like "Qcache_inserts";
79Variable_name Value
80Qcache_inserts 1
81show status like "Qcache_hits";
82Variable_name Value
83Qcache_hits 4
84-----------------------------------------------------
85-- with comment first
86select * from t1
87-----------------------------------------------------
88show status like "Qcache_queries_in_cache";
89Variable_name Value
90Qcache_queries_in_cache 1
91show status like "Qcache_inserts";
92Variable_name Value
93Qcache_inserts 1
94show status like "Qcache_hits";
95Variable_name Value
96Qcache_hits 4
97-- with comment first
98select * from t1;
99a
1001
1012
1023
103-- with comment first
104select * from t1;
105a
1061
1072
1083
109show status like "Qcache_queries_in_cache";
110Variable_name Value
111Qcache_queries_in_cache 1
112show status like "Qcache_inserts";
113Variable_name Value
114Qcache_inserts 1
115show status like "Qcache_hits";
116Variable_name Value
117Qcache_hits 6
118-----------------------------------------------------
119/* with comment first and "quote" */select * from t1
120-----------------------------------------------------
121show status like "Qcache_queries_in_cache";
122Variable_name Value
123Qcache_queries_in_cache 1
124show status like "Qcache_inserts";
125Variable_name Value
126Qcache_inserts 1
127show status like "Qcache_hits";
128Variable_name Value
129Qcache_hits 6
130/* with comment first and "quote" */select * from t1;
131a
1321
1332
1343
135/* with comment first and "quote" */select * from t1;
136a
1371
1382
1393
140show status like "Qcache_queries_in_cache";
141Variable_name Value
142Qcache_queries_in_cache 1
143show status like "Qcache_inserts";
144Variable_name Value
145Qcache_inserts 1
146show status like "Qcache_hits";
147Variable_name Value
148Qcache_hits 8
149-----------------------------------------------------
150# with comment first and "quote"
151select * from t1
152-----------------------------------------------------
153show status like "Qcache_queries_in_cache";
154Variable_name Value
155Qcache_queries_in_cache 1
156show status like "Qcache_inserts";
157Variable_name Value
158Qcache_inserts 1
159show status like "Qcache_hits";
160Variable_name Value
161Qcache_hits 8
162# with comment first and "quote"
163select * from t1;
164a
1651
1662
1673
168# with comment first and "quote"
169select * from t1;
170a
1711
1722
1733
174show status like "Qcache_queries_in_cache";
175Variable_name Value
176Qcache_queries_in_cache 1
177show status like "Qcache_inserts";
178Variable_name Value
179Qcache_inserts 1
180show status like "Qcache_hits";
181Variable_name Value
182Qcache_hits 10
183-----------------------------------------------------
184-- with comment first and "quote"
185select * from t1
186-----------------------------------------------------
187show status like "Qcache_queries_in_cache";
188Variable_name Value
189Qcache_queries_in_cache 1
190show status like "Qcache_inserts";
191Variable_name Value
192Qcache_inserts 1
193show status like "Qcache_hits";
194Variable_name Value
195Qcache_hits 10
196-- with comment first and "quote"
197select * from t1;
198a
1991
2002
2013
202-- with comment first and "quote"
203select * from t1;
204a
2051
2062
2073
208show status like "Qcache_queries_in_cache";
209Variable_name Value
210Qcache_queries_in_cache 1
211show status like "Qcache_inserts";
212Variable_name Value
213Qcache_inserts 1
214show status like "Qcache_hits";
215Variable_name Value
216Qcache_hits 12
217-----------------------------------------------------
218/* with comment and whitespaces first */select * from t1
219-----------------------------------------------------
220show status like "Qcache_queries_in_cache";
221Variable_name Value
222Qcache_queries_in_cache 1
223show status like "Qcache_inserts";
224Variable_name Value
225Qcache_inserts 1
226show status like "Qcache_hits";
227Variable_name Value
228Qcache_hits 12
229/* with comment and whitespaces first */select * from t1;
230a
2311
2322
2333
234/* with comment and whitespaces first */select * from t1;
235a
2361
2372
2383
239show status like "Qcache_queries_in_cache";
240Variable_name Value
241Qcache_queries_in_cache 1
242show status like "Qcache_inserts";
243Variable_name Value
244Qcache_inserts 1
245show status like "Qcache_hits";
246Variable_name Value
247Qcache_hits 14
248-----------------------------------------------------
249# with comment and whitespaces first
250select * from t1
251-----------------------------------------------------
252show status like "Qcache_queries_in_cache";
253Variable_name Value
254Qcache_queries_in_cache 1
255show status like "Qcache_inserts";
256Variable_name Value
257Qcache_inserts 1
258show status like "Qcache_hits";
259Variable_name Value
260Qcache_hits 14
261# with comment and whitespaces first
262select * from t1;
263a
2641
2652
2663
267# with comment and whitespaces first
268select * from t1;
269a
2701
2712
2723
273show status like "Qcache_queries_in_cache";
274Variable_name Value
275Qcache_queries_in_cache 1
276show status like "Qcache_inserts";
277Variable_name Value
278Qcache_inserts 1
279show status like "Qcache_hits";
280Variable_name Value
281Qcache_hits 16
282-----------------------------------------------------
283-- with comment and whitespaces first
284select * from t1
285-----------------------------------------------------
286show status like "Qcache_queries_in_cache";
287Variable_name Value
288Qcache_queries_in_cache 1
289show status like "Qcache_inserts";
290Variable_name Value
291Qcache_inserts 1
292show status like "Qcache_hits";
293Variable_name Value
294Qcache_hits 16
295-- with comment and whitespaces first
296select * from t1;
297a
2981
2992
3003
301-- with comment and whitespaces first
302select * from t1;
303a
3041
3052
3063
307show status like "Qcache_queries_in_cache";
308Variable_name Value
309Qcache_queries_in_cache 1
310show status like "Qcache_inserts";
311Variable_name Value
312Qcache_inserts 1
313show status like "Qcache_hits";
314Variable_name Value
315Qcache_hits 18
316-----------------------------------------------------
317select * /* internal comment */ from t1
318-----------------------------------------------------
319show status like "Qcache_queries_in_cache";
320Variable_name Value
321Qcache_queries_in_cache 1
322show status like "Qcache_inserts";
323Variable_name Value
324Qcache_inserts 1
325show status like "Qcache_hits";
326Variable_name Value
327Qcache_hits 18
328select * /* internal comment */ from t1;
329a
3301
3312
3323
333select * /* internal comment */ from t1;
334a
3351
3362
3373
338show status like "Qcache_queries_in_cache";
339Variable_name Value
340Qcache_queries_in_cache 1
341show status like "Qcache_inserts";
342Variable_name Value
343Qcache_inserts 1
344show status like "Qcache_hits";
345Variable_name Value
346Qcache_hits 20
347-----------------------------------------------------
348select */* internal comment */ from t1
349-----------------------------------------------------
350show status like "Qcache_queries_in_cache";
351Variable_name Value
352Qcache_queries_in_cache 1
353show status like "Qcache_inserts";
354Variable_name Value
355Qcache_inserts 1
356show status like "Qcache_hits";
357Variable_name Value
358Qcache_hits 20
359select */* internal comment */ from t1;
360a
3611
3622
3633
364select */* internal comment */ from t1;
365a
3661
3672
3683
369show status like "Qcache_queries_in_cache";
370Variable_name Value
371Qcache_queries_in_cache 1
372show status like "Qcache_inserts";
373Variable_name Value
374Qcache_inserts 1
375show status like "Qcache_hits";
376Variable_name Value
377Qcache_hits 22
378-----------------------------------------------------
379select */* internal comment */from t1
380-----------------------------------------------------
381show status like "Qcache_queries_in_cache";
382Variable_name Value
383Qcache_queries_in_cache 1
384show status like "Qcache_inserts";
385Variable_name Value
386Qcache_inserts 1
387show status like "Qcache_hits";
388Variable_name Value
389Qcache_hits 22
390select */* internal comment */from t1;
391a
3921
3932
3943
395select */* internal comment */from t1;
396a
3971
3982
3993
400show status like "Qcache_queries_in_cache";
401Variable_name Value
402Qcache_queries_in_cache 1
403show status like "Qcache_inserts";
404Variable_name Value
405Qcache_inserts 1
406show status like "Qcache_hits";
407Variable_name Value
408Qcache_hits 24
409-----------------------------------------------------
410select * /* internal comment with "quote" */ from t1
411-----------------------------------------------------
412show status like "Qcache_queries_in_cache";
413Variable_name Value
414Qcache_queries_in_cache 1
415show status like "Qcache_inserts";
416Variable_name Value
417Qcache_inserts 1
418show status like "Qcache_hits";
419Variable_name Value
420Qcache_hits 24
421select * /* internal comment with "quote" */ from t1;
422a
4231
4242
4253
426select * /* internal comment with "quote" */ from t1;
427a
4281
4292
4303
431show status like "Qcache_queries_in_cache";
432Variable_name Value
433Qcache_queries_in_cache 1
434show status like "Qcache_inserts";
435Variable_name Value
436Qcache_inserts 1
437show status like "Qcache_hits";
438Variable_name Value
439Qcache_hits 26
440-----------------------------------------------------
441select */* internal comment with "quote" */ from t1
442-----------------------------------------------------
443show status like "Qcache_queries_in_cache";
444Variable_name Value
445Qcache_queries_in_cache 1
446show status like "Qcache_inserts";
447Variable_name Value
448Qcache_inserts 1
449show status like "Qcache_hits";
450Variable_name Value
451Qcache_hits 26
452select */* internal comment with "quote" */ from t1;
453a
4541
4552
4563
457select */* internal comment with "quote" */ from t1;
458a
4591
4602
4613
462show status like "Qcache_queries_in_cache";
463Variable_name Value
464Qcache_queries_in_cache 1
465show status like "Qcache_inserts";
466Variable_name Value
467Qcache_inserts 1
468show status like "Qcache_hits";
469Variable_name Value
470Qcache_hits 28
471-----------------------------------------------------
472select */* internal comment with "quote" */from t1
473-----------------------------------------------------
474show status like "Qcache_queries_in_cache";
475Variable_name Value
476Qcache_queries_in_cache 1
477show status like "Qcache_inserts";
478Variable_name Value
479Qcache_inserts 1
480show status like "Qcache_hits";
481Variable_name Value
482Qcache_hits 28
483select */* internal comment with "quote" */from t1;
484a
4851
4862
4873
488select */* internal comment with "quote" */from t1;
489a
4901
4912
4923
493show status like "Qcache_queries_in_cache";
494Variable_name Value
495Qcache_queries_in_cache 1
496show status like "Qcache_inserts";
497Variable_name Value
498Qcache_inserts 1
499show status like "Qcache_hits";
500Variable_name Value
501Qcache_hits 30
502-----------------------------------------------------
503select * from t1
504
505-----------------------------------------------------
506show status like "Qcache_queries_in_cache";
507Variable_name Value
508Qcache_queries_in_cache 1
509show status like "Qcache_inserts";
510Variable_name Value
511Qcache_inserts 1
512show status like "Qcache_hits";
513Variable_name Value
514Qcache_hits 30
515select * from t1
516;
517a
5181
5192
5203
521select * from t1
522;
523a
5241
5252
5263
527show status like "Qcache_queries_in_cache";
528Variable_name Value
529Qcache_queries_in_cache 1
530show status like "Qcache_inserts";
531Variable_name Value
532Qcache_inserts 1
533show status like "Qcache_hits";
534Variable_name Value
535Qcache_hits 32
536-----------------------------------------------------
537select * from t1
538-----------------------------------------------------
539show status like "Qcache_queries_in_cache";
540Variable_name Value
541Qcache_queries_in_cache 1
542show status like "Qcache_inserts";
543Variable_name Value
544Qcache_inserts 1
545show status like "Qcache_hits";
546Variable_name Value
547Qcache_hits 32
548select * from t1 ;
549a
5501
5512
5523
553select * from t1 ;
554a
5551
5562
5573
558show status like "Qcache_queries_in_cache";
559Variable_name Value
560Qcache_queries_in_cache 1
561show status like "Qcache_inserts";
562Variable_name Value
563Qcache_inserts 1
564show status like "Qcache_hits";
565Variable_name Value
566Qcache_hits 34
567-----------------------------------------------------
568select * from t1
569-----------------------------------------------------
570show status like "Qcache_queries_in_cache";
571Variable_name Value
572Qcache_queries_in_cache 1
573show status like "Qcache_inserts";
574Variable_name Value
575Qcache_inserts 1
576show status like "Qcache_hits";
577Variable_name Value
578Qcache_hits 34
579select * from t1 ;
580a
5811
5822
5833
584select * from t1 ;
585a
5861
5872
5883
589show status like "Qcache_queries_in_cache";
590Variable_name Value
591Qcache_queries_in_cache 1
592show status like "Qcache_inserts";
593Variable_name Value
594Qcache_inserts 1
595show status like "Qcache_hits";
596Variable_name Value
597Qcache_hits 36
598-----------------------------------------------------
599select * from t1
600/* comment in the end */
601-----------------------------------------------------
602show status like "Qcache_queries_in_cache";
603Variable_name Value
604Qcache_queries_in_cache 1
605show status like "Qcache_inserts";
606Variable_name Value
607Qcache_inserts 1
608show status like "Qcache_hits";
609Variable_name Value
610Qcache_hits 36
611select * from t1
612/* comment in the end */;
613a
6141
6152
6163
617select * from t1
618/* comment in the end */;
619a
6201
6212
6223
623show status like "Qcache_queries_in_cache";
624Variable_name Value
625Qcache_queries_in_cache 1
626show status like "Qcache_inserts";
627Variable_name Value
628Qcache_inserts 1
629show status like "Qcache_hits";
630Variable_name Value
631Qcache_hits 38
632-----------------------------------------------------
633select * from t1
634/* *\/ */
635-----------------------------------------------------
636show status like "Qcache_queries_in_cache";
637Variable_name Value
638Qcache_queries_in_cache 1
639show status like "Qcache_inserts";
640Variable_name Value
641Qcache_inserts 1
642show status like "Qcache_hits";
643Variable_name Value
644Qcache_hits 38
645select * from t1
646/* *\/ */;
647a
6481
6492
6503
651select * from t1
652/* *\/ */;
653a
6541
6552
6563
657show status like "Qcache_queries_in_cache";
658Variable_name Value
659Qcache_queries_in_cache 1
660show status like "Qcache_inserts";
661Variable_name Value
662Qcache_inserts 1
663show status like "Qcache_hits";
664Variable_name Value
665Qcache_hits 40
666-----------------------------------------------------
667select * from t1
668/* comment in the end */
669
670-----------------------------------------------------
671show status like "Qcache_queries_in_cache";
672Variable_name Value
673Qcache_queries_in_cache 1
674show status like "Qcache_inserts";
675Variable_name Value
676Qcache_inserts 1
677show status like "Qcache_hits";
678Variable_name Value
679Qcache_hits 40
680select * from t1
681/* comment in the end */
682;
683a
6841
6852
6863
687select * from t1
688/* comment in the end */
689;
690a
6911
6922
6933
694show status like "Qcache_queries_in_cache";
695Variable_name Value
696Qcache_queries_in_cache 1
697show status like "Qcache_inserts";
698Variable_name Value
699Qcache_inserts 1
700show status like "Qcache_hits";
701Variable_name Value
702Qcache_hits 42
703-----------------------------------------------------
704select * from t1 #comment in the end
705-----------------------------------------------------
706show status like "Qcache_queries_in_cache";
707Variable_name Value
708Qcache_queries_in_cache 1
709show status like "Qcache_inserts";
710Variable_name Value
711Qcache_inserts 1
712show status like "Qcache_hits";
713Variable_name Value
714Qcache_hits 42
715select * from t1 #comment in the end;
716a
7171
7182
7193
720select * from t1 #comment in the end;
721a
7221
7232
7243
725show status like "Qcache_queries_in_cache";
726Variable_name Value
727Qcache_queries_in_cache 1
728show status like "Qcache_inserts";
729Variable_name Value
730Qcache_inserts 1
731show status like "Qcache_hits";
732Variable_name Value
733Qcache_hits 44
734-----------------------------------------------------
735select * from t1 #comment in the end
736
737-----------------------------------------------------
738show status like "Qcache_queries_in_cache";
739Variable_name Value
740Qcache_queries_in_cache 1
741show status like "Qcache_inserts";
742Variable_name Value
743Qcache_inserts 1
744show status like "Qcache_hits";
745Variable_name Value
746Qcache_hits 44
747select * from t1 #comment in the end
748;
749a
7501
7512
7523
753select * from t1 #comment in the end
754;
755a
7561
7572
7583
759show status like "Qcache_queries_in_cache";
760Variable_name Value
761Qcache_queries_in_cache 1
762show status like "Qcache_inserts";
763Variable_name Value
764Qcache_inserts 1
765show status like "Qcache_hits";
766Variable_name Value
767Qcache_hits 46
768-----------------------------------------------------
769select * from t1 -- comment in the end
770-----------------------------------------------------
771show status like "Qcache_queries_in_cache";
772Variable_name Value
773Qcache_queries_in_cache 1
774show status like "Qcache_inserts";
775Variable_name Value
776Qcache_inserts 1
777show status like "Qcache_hits";
778Variable_name Value
779Qcache_hits 46
780select * from t1 -- comment in the end;
781a
7821
7832
7843
785select * from t1 -- comment in the end;
786a
7871
7882
7893
790show status like "Qcache_queries_in_cache";
791Variable_name Value
792Qcache_queries_in_cache 1
793show status like "Qcache_inserts";
794Variable_name Value
795Qcache_inserts 1
796show status like "Qcache_hits";
797Variable_name Value
798Qcache_hits 48
799-----------------------------------------------------
800select * from t1 -- comment in the end
801
802-----------------------------------------------------
803show status like "Qcache_queries_in_cache";
804Variable_name Value
805Qcache_queries_in_cache 1
806show status like "Qcache_inserts";
807Variable_name Value
808Qcache_inserts 1
809show status like "Qcache_hits";
810Variable_name Value
811Qcache_hits 48
812select * from t1 -- comment in the end
813;
814a
8151
8162
8173
818select * from t1 -- comment in the end
819;
820a
8211
8222
8233
824show status like "Qcache_queries_in_cache";
825Variable_name Value
826Qcache_queries_in_cache 1
827show status like "Qcache_inserts";
828Variable_name Value
829Qcache_inserts 1
830show status like "Qcache_hits";
831Variable_name Value
832Qcache_hits 50
833-----------------------------------------------------
834select ' \' ' from t1
835-----------------------------------------------------
836show status like "Qcache_queries_in_cache";
837Variable_name Value
838Qcache_queries_in_cache 1
839show status like "Qcache_inserts";
840Variable_name Value
841Qcache_inserts 1
842show status like "Qcache_hits";
843Variable_name Value
844Qcache_hits 50
845select ' \' ' from t1;
846'
847 '
848 '
849 '
850select ' \' ' from t1;
851'
852 '
853 '
854 '
855show status like "Qcache_queries_in_cache";
856Variable_name Value
857Qcache_queries_in_cache 2
858show status like "Qcache_inserts";
859Variable_name Value
860Qcache_inserts 2
861show status like "Qcache_hits";
862Variable_name Value
863Qcache_hits 51
864DROP TABLE t1;
865SET GLOBAL query_cache_size=default;
866set global query_cache_strip_comments=OFF;
0867
=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments.result 1970-01-01 00:00:00 +0000
@@ -1,866 +0,0 @@
1set global query_cache_strip_comments=ON;
2set GLOBAL query_cache_size=1355776;
3drop table if exists t1;
4create table t1 (a int not null);
5insert into t1 values (1),(2),(3);
6flush query cache;
7flush query cache;
8reset query cache;
9flush status;
10flush query cache;
11flush query cache;
12reset query cache;
13flush status;
14/* with comment first */select * from t1;
15a
161
172
183
19-----------------------------------------------------
20/* with comment first */select * from t1
21-----------------------------------------------------
22show status like "Qcache_queries_in_cache";
23Variable_name Value
24Qcache_queries_in_cache 1
25show status like "Qcache_inserts";
26Variable_name Value
27Qcache_inserts 1
28show status like "Qcache_hits";
29Variable_name Value
30Qcache_hits 0
31/* with comment first */select * from t1;
32a
331
342
353
36/* with comment first */select * from t1;
37a
381
392
403
41show status like "Qcache_queries_in_cache";
42Variable_name Value
43Qcache_queries_in_cache 1
44show status like "Qcache_inserts";
45Variable_name Value
46Qcache_inserts 1
47show status like "Qcache_hits";
48Variable_name Value
49Qcache_hits 2
50-----------------------------------------------------
51# with comment first
52select * from t1
53-----------------------------------------------------
54show status like "Qcache_queries_in_cache";
55Variable_name Value
56Qcache_queries_in_cache 1
57show status like "Qcache_inserts";
58Variable_name Value
59Qcache_inserts 1
60show status like "Qcache_hits";
61Variable_name Value
62Qcache_hits 2
63# with comment first
64select * from t1;
65a
661
672
683
69# with comment first
70select * from t1;
71a
721
732
743
75show status like "Qcache_queries_in_cache";
76Variable_name Value
77Qcache_queries_in_cache 1
78show status like "Qcache_inserts";
79Variable_name Value
80Qcache_inserts 1
81show status like "Qcache_hits";
82Variable_name Value
83Qcache_hits 4
84-----------------------------------------------------
85-- with comment first
86select * from t1
87-----------------------------------------------------
88show status like "Qcache_queries_in_cache";
89Variable_name Value
90Qcache_queries_in_cache 1
91show status like "Qcache_inserts";
92Variable_name Value
93Qcache_inserts 1
94show status like "Qcache_hits";
95Variable_name Value
96Qcache_hits 4
97-- with comment first
98select * from t1;
99a
1001
1012
1023
103-- with comment first
104select * from t1;
105a
1061
1072
1083
109show status like "Qcache_queries_in_cache";
110Variable_name Value
111Qcache_queries_in_cache 1
112show status like "Qcache_inserts";
113Variable_name Value
114Qcache_inserts 1
115show status like "Qcache_hits";
116Variable_name Value
117Qcache_hits 6
118-----------------------------------------------------
119/* with comment first and "quote" */select * from t1
120-----------------------------------------------------
121show status like "Qcache_queries_in_cache";
122Variable_name Value
123Qcache_queries_in_cache 1
124show status like "Qcache_inserts";
125Variable_name Value
126Qcache_inserts 1
127show status like "Qcache_hits";
128Variable_name Value
129Qcache_hits 6
130/* with comment first and "quote" */select * from t1;
131a
1321
1332
1343
135/* with comment first and "quote" */select * from t1;
136a
1371
1382
1393
140show status like "Qcache_queries_in_cache";
141Variable_name Value
142Qcache_queries_in_cache 1
143show status like "Qcache_inserts";
144Variable_name Value
145Qcache_inserts 1
146show status like "Qcache_hits";
147Variable_name Value
148Qcache_hits 8
149-----------------------------------------------------
150# with comment first and "quote"
151select * from t1
152-----------------------------------------------------
153show status like "Qcache_queries_in_cache";
154Variable_name Value
155Qcache_queries_in_cache 1
156show status like "Qcache_inserts";
157Variable_name Value
158Qcache_inserts 1
159show status like "Qcache_hits";
160Variable_name Value
161Qcache_hits 8
162# with comment first and "quote"
163select * from t1;
164a
1651
1662
1673
168# with comment first and "quote"
169select * from t1;
170a
1711
1722
1733
174show status like "Qcache_queries_in_cache";
175Variable_name Value
176Qcache_queries_in_cache 1
177show status like "Qcache_inserts";
178Variable_name Value
179Qcache_inserts 1
180show status like "Qcache_hits";
181Variable_name Value
182Qcache_hits 10
183-----------------------------------------------------
184-- with comment first and "quote"
185select * from t1
186-----------------------------------------------------
187show status like "Qcache_queries_in_cache";
188Variable_name Value
189Qcache_queries_in_cache 1
190show status like "Qcache_inserts";
191Variable_name Value
192Qcache_inserts 1
193show status like "Qcache_hits";
194Variable_name Value
195Qcache_hits 10
196-- with comment first and "quote"
197select * from t1;
198a
1991
2002
2013
202-- with comment first and "quote"
203select * from t1;
204a
2051
2062
2073
208show status like "Qcache_queries_in_cache";
209Variable_name Value
210Qcache_queries_in_cache 1
211show status like "Qcache_inserts";
212Variable_name Value
213Qcache_inserts 1
214show status like "Qcache_hits";
215Variable_name Value
216Qcache_hits 12
217-----------------------------------------------------
218/* with comment and whitespaces first */select * from t1
219-----------------------------------------------------
220show status like "Qcache_queries_in_cache";
221Variable_name Value
222Qcache_queries_in_cache 1
223show status like "Qcache_inserts";
224Variable_name Value
225Qcache_inserts 1
226show status like "Qcache_hits";
227Variable_name Value
228Qcache_hits 12
229/* with comment and whitespaces first */select * from t1;
230a
2311
2322
2333
234/* with comment and whitespaces first */select * from t1;
235a
2361
2372
2383
239show status like "Qcache_queries_in_cache";
240Variable_name Value
241Qcache_queries_in_cache 1
242show status like "Qcache_inserts";
243Variable_name Value
244Qcache_inserts 1
245show status like "Qcache_hits";
246Variable_name Value
247Qcache_hits 14
248-----------------------------------------------------
249# with comment and whitespaces first
250select * from t1
251-----------------------------------------------------
252show status like "Qcache_queries_in_cache";
253Variable_name Value
254Qcache_queries_in_cache 1
255show status like "Qcache_inserts";
256Variable_name Value
257Qcache_inserts 1
258show status like "Qcache_hits";
259Variable_name Value
260Qcache_hits 14
261# with comment and whitespaces first
262select * from t1;
263a
2641
2652
2663
267# with comment and whitespaces first
268select * from t1;
269a
2701
2712
2723
273show status like "Qcache_queries_in_cache";
274Variable_name Value
275Qcache_queries_in_cache 1
276show status like "Qcache_inserts";
277Variable_name Value
278Qcache_inserts 1
279show status like "Qcache_hits";
280Variable_name Value
281Qcache_hits 16
282-----------------------------------------------------
283-- with comment and whitespaces first
284select * from t1
285-----------------------------------------------------
286show status like "Qcache_queries_in_cache";
287Variable_name Value
288Qcache_queries_in_cache 1
289show status like "Qcache_inserts";
290Variable_name Value
291Qcache_inserts 1
292show status like "Qcache_hits";
293Variable_name Value
294Qcache_hits 16
295-- with comment and whitespaces first
296select * from t1;
297a
2981
2992
3003
301-- with comment and whitespaces first
302select * from t1;
303a
3041
3052
3063
307show status like "Qcache_queries_in_cache";
308Variable_name Value
309Qcache_queries_in_cache 1
310show status like "Qcache_inserts";
311Variable_name Value
312Qcache_inserts 1
313show status like "Qcache_hits";
314Variable_name Value
315Qcache_hits 18
316-----------------------------------------------------
317select * /* internal comment */ from t1
318-----------------------------------------------------
319show status like "Qcache_queries_in_cache";
320Variable_name Value
321Qcache_queries_in_cache 1
322show status like "Qcache_inserts";
323Variable_name Value
324Qcache_inserts 1
325show status like "Qcache_hits";
326Variable_name Value
327Qcache_hits 18
328select * /* internal comment */ from t1;
329a
3301
3312
3323
333select * /* internal comment */ from t1;
334a
3351
3362
3373
338show status like "Qcache_queries_in_cache";
339Variable_name Value
340Qcache_queries_in_cache 1
341show status like "Qcache_inserts";
342Variable_name Value
343Qcache_inserts 1
344show status like "Qcache_hits";
345Variable_name Value
346Qcache_hits 20
347-----------------------------------------------------
348select */* internal comment */ from t1
349-----------------------------------------------------
350show status like "Qcache_queries_in_cache";
351Variable_name Value
352Qcache_queries_in_cache 1
353show status like "Qcache_inserts";
354Variable_name Value
355Qcache_inserts 1
356show status like "Qcache_hits";
357Variable_name Value
358Qcache_hits 20
359select */* internal comment */ from t1;
360a
3611
3622
3633
364select */* internal comment */ from t1;
365a
3661
3672
3683
369show status like "Qcache_queries_in_cache";
370Variable_name Value
371Qcache_queries_in_cache 1
372show status like "Qcache_inserts";
373Variable_name Value
374Qcache_inserts 1
375show status like "Qcache_hits";
376Variable_name Value
377Qcache_hits 22
378-----------------------------------------------------
379select */* internal comment */from t1
380-----------------------------------------------------
381show status like "Qcache_queries_in_cache";
382Variable_name Value
383Qcache_queries_in_cache 1
384show status like "Qcache_inserts";
385Variable_name Value
386Qcache_inserts 1
387show status like "Qcache_hits";
388Variable_name Value
389Qcache_hits 22
390select */* internal comment */from t1;
391a
3921
3932
3943
395select */* internal comment */from t1;
396a
3971
3982
3993
400show status like "Qcache_queries_in_cache";
401Variable_name Value
402Qcache_queries_in_cache 1
403show status like "Qcache_inserts";
404Variable_name Value
405Qcache_inserts 1
406show status like "Qcache_hits";
407Variable_name Value
408Qcache_hits 24
409-----------------------------------------------------
410select * /* internal comment with "quote" */ from t1
411-----------------------------------------------------
412show status like "Qcache_queries_in_cache";
413Variable_name Value
414Qcache_queries_in_cache 1
415show status like "Qcache_inserts";
416Variable_name Value
417Qcache_inserts 1
418show status like "Qcache_hits";
419Variable_name Value
420Qcache_hits 24
421select * /* internal comment with "quote" */ from t1;
422a
4231
4242
4253
426select * /* internal comment with "quote" */ from t1;
427a
4281
4292
4303
431show status like "Qcache_queries_in_cache";
432Variable_name Value
433Qcache_queries_in_cache 1
434show status like "Qcache_inserts";
435Variable_name Value
436Qcache_inserts 1
437show status like "Qcache_hits";
438Variable_name Value
439Qcache_hits 26
440-----------------------------------------------------
441select */* internal comment with "quote" */ from t1
442-----------------------------------------------------
443show status like "Qcache_queries_in_cache";
444Variable_name Value
445Qcache_queries_in_cache 1
446show status like "Qcache_inserts";
447Variable_name Value
448Qcache_inserts 1
449show status like "Qcache_hits";
450Variable_name Value
451Qcache_hits 26
452select */* internal comment with "quote" */ from t1;
453a
4541
4552
4563
457select */* internal comment with "quote" */ from t1;
458a
4591
4602
4613
462show status like "Qcache_queries_in_cache";
463Variable_name Value
464Qcache_queries_in_cache 1
465show status like "Qcache_inserts";
466Variable_name Value
467Qcache_inserts 1
468show status like "Qcache_hits";
469Variable_name Value
470Qcache_hits 28
471-----------------------------------------------------
472select */* internal comment with "quote" */from t1
473-----------------------------------------------------
474show status like "Qcache_queries_in_cache";
475Variable_name Value
476Qcache_queries_in_cache 1
477show status like "Qcache_inserts";
478Variable_name Value
479Qcache_inserts 1
480show status like "Qcache_hits";
481Variable_name Value
482Qcache_hits 28
483select */* internal comment with "quote" */from t1;
484a
4851
4862
4873
488select */* internal comment with "quote" */from t1;
489a
4901
4912
4923
493show status like "Qcache_queries_in_cache";
494Variable_name Value
495Qcache_queries_in_cache 1
496show status like "Qcache_inserts";
497Variable_name Value
498Qcache_inserts 1
499show status like "Qcache_hits";
500Variable_name Value
501Qcache_hits 30
502-----------------------------------------------------
503select * from t1
504
505-----------------------------------------------------
506show status like "Qcache_queries_in_cache";
507Variable_name Value
508Qcache_queries_in_cache 1
509show status like "Qcache_inserts";
510Variable_name Value
511Qcache_inserts 1
512show status like "Qcache_hits";
513Variable_name Value
514Qcache_hits 30
515select * from t1
516;
517a
5181
5192
5203
521select * from t1
522;
523a
5241
5252
5263
527show status like "Qcache_queries_in_cache";
528Variable_name Value
529Qcache_queries_in_cache 1
530show status like "Qcache_inserts";
531Variable_name Value
532Qcache_inserts 1
533show status like "Qcache_hits";
534Variable_name Value
535Qcache_hits 32
536-----------------------------------------------------
537select * from t1
538-----------------------------------------------------
539show status like "Qcache_queries_in_cache";
540Variable_name Value
541Qcache_queries_in_cache 1
542show status like "Qcache_inserts";
543Variable_name Value
544Qcache_inserts 1
545show status like "Qcache_hits";
546Variable_name Value
547Qcache_hits 32
548select * from t1 ;
549a
5501
5512
5523
553select * from t1 ;
554a
5551
5562
5573
558show status like "Qcache_queries_in_cache";
559Variable_name Value
560Qcache_queries_in_cache 1
561show status like "Qcache_inserts";
562Variable_name Value
563Qcache_inserts 1
564show status like "Qcache_hits";
565Variable_name Value
566Qcache_hits 34
567-----------------------------------------------------
568select * from t1
569-----------------------------------------------------
570show status like "Qcache_queries_in_cache";
571Variable_name Value
572Qcache_queries_in_cache 1
573show status like "Qcache_inserts";
574Variable_name Value
575Qcache_inserts 1
576show status like "Qcache_hits";
577Variable_name Value
578Qcache_hits 34
579select * from t1 ;
580a
5811
5822
5833
584select * from t1 ;
585a
5861
5872
5883
589show status like "Qcache_queries_in_cache";
590Variable_name Value
591Qcache_queries_in_cache 1
592show status like "Qcache_inserts";
593Variable_name Value
594Qcache_inserts 1
595show status like "Qcache_hits";
596Variable_name Value
597Qcache_hits 36
598-----------------------------------------------------
599select * from t1
600/* comment in the end */
601-----------------------------------------------------
602show status like "Qcache_queries_in_cache";
603Variable_name Value
604Qcache_queries_in_cache 1
605show status like "Qcache_inserts";
606Variable_name Value
607Qcache_inserts 1
608show status like "Qcache_hits";
609Variable_name Value
610Qcache_hits 36
611select * from t1
612/* comment in the end */;
613a
6141
6152
6163
617select * from t1
618/* comment in the end */;
619a
6201
6212
6223
623show status like "Qcache_queries_in_cache";
624Variable_name Value
625Qcache_queries_in_cache 1
626show status like "Qcache_inserts";
627Variable_name Value
628Qcache_inserts 1
629show status like "Qcache_hits";
630Variable_name Value
631Qcache_hits 38
632-----------------------------------------------------
633select * from t1
634/* *\/ */
635-----------------------------------------------------
636show status like "Qcache_queries_in_cache";
637Variable_name Value
638Qcache_queries_in_cache 1
639show status like "Qcache_inserts";
640Variable_name Value
641Qcache_inserts 1
642show status like "Qcache_hits";
643Variable_name Value
644Qcache_hits 38
645select * from t1
646/* *\/ */;
647a
6481
6492
6503
651select * from t1
652/* *\/ */;
653a
6541
6552
6563
657show status like "Qcache_queries_in_cache";
658Variable_name Value
659Qcache_queries_in_cache 1
660show status like "Qcache_inserts";
661Variable_name Value
662Qcache_inserts 1
663show status like "Qcache_hits";
664Variable_name Value
665Qcache_hits 40
666-----------------------------------------------------
667select * from t1
668/* comment in the end */
669
670-----------------------------------------------------
671show status like "Qcache_queries_in_cache";
672Variable_name Value
673Qcache_queries_in_cache 1
674show status like "Qcache_inserts";
675Variable_name Value
676Qcache_inserts 1
677show status like "Qcache_hits";
678Variable_name Value
679Qcache_hits 40
680select * from t1
681/* comment in the end */
682;
683a
6841
6852
6863
687select * from t1
688/* comment in the end */
689;
690a
6911
6922
6933
694show status like "Qcache_queries_in_cache";
695Variable_name Value
696Qcache_queries_in_cache 1
697show status like "Qcache_inserts";
698Variable_name Value
699Qcache_inserts 1
700show status like "Qcache_hits";
701Variable_name Value
702Qcache_hits 42
703-----------------------------------------------------
704select * from t1 #comment in the end
705-----------------------------------------------------
706show status like "Qcache_queries_in_cache";
707Variable_name Value
708Qcache_queries_in_cache 1
709show status like "Qcache_inserts";
710Variable_name Value
711Qcache_inserts 1
712show status like "Qcache_hits";
713Variable_name Value
714Qcache_hits 42
715select * from t1 #comment in the end;
716a
7171
7182
7193
720select * from t1 #comment in the end;
721a
7221
7232
7243
725show status like "Qcache_queries_in_cache";
726Variable_name Value
727Qcache_queries_in_cache 1
728show status like "Qcache_inserts";
729Variable_name Value
730Qcache_inserts 1
731show status like "Qcache_hits";
732Variable_name Value
733Qcache_hits 44
734-----------------------------------------------------
735select * from t1 #comment in the end
736
737-----------------------------------------------------
738show status like "Qcache_queries_in_cache";
739Variable_name Value
740Qcache_queries_in_cache 1
741show status like "Qcache_inserts";
742Variable_name Value
743Qcache_inserts 1
744show status like "Qcache_hits";
745Variable_name Value
746Qcache_hits 44
747select * from t1 #comment in the end
748;
749a
7501
7512
7523
753select * from t1 #comment in the end
754;
755a
7561
7572
7583
759show status like "Qcache_queries_in_cache";
760Variable_name Value
761Qcache_queries_in_cache 1
762show status like "Qcache_inserts";
763Variable_name Value
764Qcache_inserts 1
765show status like "Qcache_hits";
766Variable_name Value
767Qcache_hits 46
768-----------------------------------------------------
769select * from t1 -- comment in the end
770-----------------------------------------------------
771show status like "Qcache_queries_in_cache";
772Variable_name Value
773Qcache_queries_in_cache 1
774show status like "Qcache_inserts";
775Variable_name Value
776Qcache_inserts 1
777show status like "Qcache_hits";
778Variable_name Value
779Qcache_hits 46
780select * from t1 -- comment in the end;
781a
7821
7832
7843
785select * from t1 -- comment in the end;
786a
7871
7882
7893
790show status like "Qcache_queries_in_cache";
791Variable_name Value
792Qcache_queries_in_cache 1
793show status like "Qcache_inserts";
794Variable_name Value
795Qcache_inserts 1
796show status like "Qcache_hits";
797Variable_name Value
798Qcache_hits 48
799-----------------------------------------------------
800select * from t1 -- comment in the end
801
802-----------------------------------------------------
803show status like "Qcache_queries_in_cache";
804Variable_name Value
805Qcache_queries_in_cache 1
806show status like "Qcache_inserts";
807Variable_name Value
808Qcache_inserts 1
809show status like "Qcache_hits";
810Variable_name Value
811Qcache_hits 48
812select * from t1 -- comment in the end
813;
814a
8151
8162
8173
818select * from t1 -- comment in the end
819;
820a
8211
8222
8233
824show status like "Qcache_queries_in_cache";
825Variable_name Value
826Qcache_queries_in_cache 1
827show status like "Qcache_inserts";
828Variable_name Value
829Qcache_inserts 1
830show status like "Qcache_hits";
831Variable_name Value
832Qcache_hits 50
833-----------------------------------------------------
834select ' \' ' from t1
835-----------------------------------------------------
836show status like "Qcache_queries_in_cache";
837Variable_name Value
838Qcache_queries_in_cache 1
839show status like "Qcache_inserts";
840Variable_name Value
841Qcache_inserts 1
842show status like "Qcache_hits";
843Variable_name Value
844Qcache_hits 50
845select ' \' ' from t1;
846'
847 '
848 '
849 '
850select ' \' ' from t1;
851'
852 '
853 '
854 '
855show status like "Qcache_queries_in_cache";
856Variable_name Value
857Qcache_queries_in_cache 2
858show status like "Qcache_inserts";
859Variable_name Value
860Qcache_inserts 2
861show status like "Qcache_hits";
862Variable_name Value
863Qcache_hits 51
864DROP TABLE t1;
865SET GLOBAL query_cache_size=default;
866set global query_cache_strip_comments=OFF;
8670
=== added file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,21 @@
1set GLOBAL query_cache_size=1355776;
2drop table if exists t1;
3create table t1 (a int not null);
4insert into t1 values (1),(2),(3);
5flush query cache;
6flush query cache;
7reset query cache;
8flush status;
9( select * from t1 );
10a
111
122
133
14/*!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 */;
15/* only comment */;
16# only comment
17;
18-- only comment
19;
20DROP TABLE t1;
21SET GLOBAL query_cache_size= default;
022
=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1set GLOBAL query_cache_size=1355776;
2drop table if exists t1;
3create table t1 (a int not null);
4insert into t1 values (1),(2),(3);
5flush query cache;
6flush query cache;
7reset query cache;
8flush status;
9( select * from t1 );
10a
111
122
133
14/*!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 */;
15/* only comment */;
16# only comment
17;
18-- only comment
19;
20DROP TABLE t1;
21SET GLOBAL query_cache_size= default;
220
=== added file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 2013-05-26 07:24:39 +0000
@@ -0,0 +1,865 @@
1set GLOBAL query_cache_size=1355776;
2drop table if exists t1;
3create table t1 (a int not null);
4insert into t1 values (1),(2),(3);
5flush query cache;
6flush query cache;
7reset query cache;
8flush status;
9flush query cache;
10flush query cache;
11reset query cache;
12flush status;
13/* with comment first */select * from t1;
14a
151
162
173
18-----------------------------------------------------
19/* with comment first */select * from t1
20-----------------------------------------------------
21show status like "Qcache_queries_in_cache";
22Variable_name Value
23Qcache_queries_in_cache 1
24show status like "Qcache_inserts";
25Variable_name Value
26Qcache_inserts 1
27show status like "Qcache_hits";
28Variable_name Value
29Qcache_hits 0
30/* with comment first */select * from t1;
31a
321
332
343
35/* with comment first */select * from t1;
36a
371
382
393
40show status like "Qcache_queries_in_cache";
41Variable_name Value
42Qcache_queries_in_cache 1
43show status like "Qcache_inserts";
44Variable_name Value
45Qcache_inserts 1
46show status like "Qcache_hits";
47Variable_name Value
48Qcache_hits 2
49-----------------------------------------------------
50# with comment first
51select * from t1
52-----------------------------------------------------
53show status like "Qcache_queries_in_cache";
54Variable_name Value
55Qcache_queries_in_cache 1
56show status like "Qcache_inserts";
57Variable_name Value
58Qcache_inserts 1
59show status like "Qcache_hits";
60Variable_name Value
61Qcache_hits 2
62# with comment first
63select * from t1;
64a
651
662
673
68# with comment first
69select * from t1;
70a
711
722
733
74show status like "Qcache_queries_in_cache";
75Variable_name Value
76Qcache_queries_in_cache 2
77show status like "Qcache_inserts";
78Variable_name Value
79Qcache_inserts 2
80show status like "Qcache_hits";
81Variable_name Value
82Qcache_hits 2
83-----------------------------------------------------
84-- with comment first
85select * from t1
86-----------------------------------------------------
87show status like "Qcache_queries_in_cache";
88Variable_name Value
89Qcache_queries_in_cache 2
90show status like "Qcache_inserts";
91Variable_name Value
92Qcache_inserts 2
93show status like "Qcache_hits";
94Variable_name Value
95Qcache_hits 2
96-- with comment first
97select * from t1;
98a
991
1002
1013
102-- with comment first
103select * from t1;
104a
1051
1062
1073
108show status like "Qcache_queries_in_cache";
109Variable_name Value
110Qcache_queries_in_cache 3
111show status like "Qcache_inserts";
112Variable_name Value
113Qcache_inserts 3
114show status like "Qcache_hits";
115Variable_name Value
116Qcache_hits 2
117-----------------------------------------------------
118/* with comment first and "quote" */select * from t1
119-----------------------------------------------------
120show status like "Qcache_queries_in_cache";
121Variable_name Value
122Qcache_queries_in_cache 3
123show status like "Qcache_inserts";
124Variable_name Value
125Qcache_inserts 3
126show status like "Qcache_hits";
127Variable_name Value
128Qcache_hits 2
129/* with comment first and "quote" */select * from t1;
130a
1311
1322
1333
134/* with comment first and "quote" */select * from t1;
135a
1361
1372
1383
139show status like "Qcache_queries_in_cache";
140Variable_name Value
141Qcache_queries_in_cache 4
142show status like "Qcache_inserts";
143Variable_name Value
144Qcache_inserts 4
145show status like "Qcache_hits";
146Variable_name Value
147Qcache_hits 3
148-----------------------------------------------------
149# with comment first and "quote"
150select * from t1
151-----------------------------------------------------
152show status like "Qcache_queries_in_cache";
153Variable_name Value
154Qcache_queries_in_cache 4
155show status like "Qcache_inserts";
156Variable_name Value
157Qcache_inserts 4
158show status like "Qcache_hits";
159Variable_name Value
160Qcache_hits 3
161# with comment first and "quote"
162select * from t1;
163a
1641
1652
1663
167# with comment first and "quote"
168select * from t1;
169a
1701
1712
1723
173show status like "Qcache_queries_in_cache";
174Variable_name Value
175Qcache_queries_in_cache 5
176show status like "Qcache_inserts";
177Variable_name Value
178Qcache_inserts 5
179show status like "Qcache_hits";
180Variable_name Value
181Qcache_hits 3
182-----------------------------------------------------
183-- with comment first and "quote"
184select * from t1
185-----------------------------------------------------
186show status like "Qcache_queries_in_cache";
187Variable_name Value
188Qcache_queries_in_cache 5
189show status like "Qcache_inserts";
190Variable_name Value
191Qcache_inserts 5
192show status like "Qcache_hits";
193Variable_name Value
194Qcache_hits 3
195-- with comment first and "quote"
196select * from t1;
197a
1981
1992
2003
201-- with comment first and "quote"
202select * from t1;
203a
2041
2052
2063
207show status like "Qcache_queries_in_cache";
208Variable_name Value
209Qcache_queries_in_cache 6
210show status like "Qcache_inserts";
211Variable_name Value
212Qcache_inserts 6
213show status like "Qcache_hits";
214Variable_name Value
215Qcache_hits 3
216-----------------------------------------------------
217/* with comment and whitespaces first */select * from t1
218-----------------------------------------------------
219show status like "Qcache_queries_in_cache";
220Variable_name Value
221Qcache_queries_in_cache 6
222show status like "Qcache_inserts";
223Variable_name Value
224Qcache_inserts 6
225show status like "Qcache_hits";
226Variable_name Value
227Qcache_hits 3
228/* with comment and whitespaces first */select * from t1;
229a
2301
2312
2323
233/* with comment and whitespaces first */select * from t1;
234a
2351
2362
2373
238show status like "Qcache_queries_in_cache";
239Variable_name Value
240Qcache_queries_in_cache 7
241show status like "Qcache_inserts";
242Variable_name Value
243Qcache_inserts 7
244show status like "Qcache_hits";
245Variable_name Value
246Qcache_hits 4
247-----------------------------------------------------
248# with comment and whitespaces first
249select * from t1
250-----------------------------------------------------
251show status like "Qcache_queries_in_cache";
252Variable_name Value
253Qcache_queries_in_cache 7
254show status like "Qcache_inserts";
255Variable_name Value
256Qcache_inserts 7
257show status like "Qcache_hits";
258Variable_name Value
259Qcache_hits 4
260# with comment and whitespaces first
261select * from t1;
262a
2631
2642
2653
266# with comment and whitespaces first
267select * from t1;
268a
2691
2702
2713
272show status like "Qcache_queries_in_cache";
273Variable_name Value
274Qcache_queries_in_cache 8
275show status like "Qcache_inserts";
276Variable_name Value
277Qcache_inserts 8
278show status like "Qcache_hits";
279Variable_name Value
280Qcache_hits 4
281-----------------------------------------------------
282-- with comment and whitespaces first
283select * from t1
284-----------------------------------------------------
285show status like "Qcache_queries_in_cache";
286Variable_name Value
287Qcache_queries_in_cache 8
288show status like "Qcache_inserts";
289Variable_name Value
290Qcache_inserts 8
291show status like "Qcache_hits";
292Variable_name Value
293Qcache_hits 4
294-- with comment and whitespaces first
295select * from t1;
296a
2971
2982
2993
300-- with comment and whitespaces first
301select * from t1;
302a
3031
3042
3053
306show status like "Qcache_queries_in_cache";
307Variable_name Value
308Qcache_queries_in_cache 9
309show status like "Qcache_inserts";
310Variable_name Value
311Qcache_inserts 9
312show status like "Qcache_hits";
313Variable_name Value
314Qcache_hits 4
315-----------------------------------------------------
316select * /* internal comment */ from t1
317-----------------------------------------------------
318show status like "Qcache_queries_in_cache";
319Variable_name Value
320Qcache_queries_in_cache 9
321show status like "Qcache_inserts";
322Variable_name Value
323Qcache_inserts 9
324show status like "Qcache_hits";
325Variable_name Value
326Qcache_hits 4
327select * /* internal comment */ from t1;
328a
3291
3302
3313
332select * /* internal comment */ from t1;
333a
3341
3352
3363
337show status like "Qcache_queries_in_cache";
338Variable_name Value
339Qcache_queries_in_cache 10
340show status like "Qcache_inserts";
341Variable_name Value
342Qcache_inserts 10
343show status like "Qcache_hits";
344Variable_name Value
345Qcache_hits 5
346-----------------------------------------------------
347select */* internal comment */ from t1
348-----------------------------------------------------
349show status like "Qcache_queries_in_cache";
350Variable_name Value
351Qcache_queries_in_cache 10
352show status like "Qcache_inserts";
353Variable_name Value
354Qcache_inserts 10
355show status like "Qcache_hits";
356Variable_name Value
357Qcache_hits 5
358select */* internal comment */ from t1;
359a
3601
3612
3623
363select */* internal comment */ from t1;
364a
3651
3662
3673
368show status like "Qcache_queries_in_cache";
369Variable_name Value
370Qcache_queries_in_cache 11
371show status like "Qcache_inserts";
372Variable_name Value
373Qcache_inserts 11
374show status like "Qcache_hits";
375Variable_name Value
376Qcache_hits 6
377-----------------------------------------------------
378select */* internal comment */from t1
379-----------------------------------------------------
380show status like "Qcache_queries_in_cache";
381Variable_name Value
382Qcache_queries_in_cache 11
383show status like "Qcache_inserts";
384Variable_name Value
385Qcache_inserts 11
386show status like "Qcache_hits";
387Variable_name Value
388Qcache_hits 6
389select */* internal comment */from t1;
390a
3911
3922
3933
394select */* internal comment */from t1;
395a
3961
3972
3983
399show status like "Qcache_queries_in_cache";
400Variable_name Value
401Qcache_queries_in_cache 12
402show status like "Qcache_inserts";
403Variable_name Value
404Qcache_inserts 12
405show status like "Qcache_hits";
406Variable_name Value
407Qcache_hits 7
408-----------------------------------------------------
409select * /* internal comment with "quote" */ from t1
410-----------------------------------------------------
411show status like "Qcache_queries_in_cache";
412Variable_name Value
413Qcache_queries_in_cache 12
414show status like "Qcache_inserts";
415Variable_name Value
416Qcache_inserts 12
417show status like "Qcache_hits";
418Variable_name Value
419Qcache_hits 7
420select * /* internal comment with "quote" */ from t1;
421a
4221
4232
4243
425select * /* internal comment with "quote" */ from t1;
426a
4271
4282
4293
430show status like "Qcache_queries_in_cache";
431Variable_name Value
432Qcache_queries_in_cache 13
433show status like "Qcache_inserts";
434Variable_name Value
435Qcache_inserts 13
436show status like "Qcache_hits";
437Variable_name Value
438Qcache_hits 8
439-----------------------------------------------------
440select */* internal comment with "quote" */ from t1
441-----------------------------------------------------
442show status like "Qcache_queries_in_cache";
443Variable_name Value
444Qcache_queries_in_cache 13
445show status like "Qcache_inserts";
446Variable_name Value
447Qcache_inserts 13
448show status like "Qcache_hits";
449Variable_name Value
450Qcache_hits 8
451select */* internal comment with "quote" */ from t1;
452a
4531
4542
4553
456select */* internal comment with "quote" */ from t1;
457a
4581
4592
4603
461show status like "Qcache_queries_in_cache";
462Variable_name Value
463Qcache_queries_in_cache 14
464show status like "Qcache_inserts";
465Variable_name Value
466Qcache_inserts 14
467show status like "Qcache_hits";
468Variable_name Value
469Qcache_hits 9
470-----------------------------------------------------
471select */* internal comment with "quote" */from t1
472-----------------------------------------------------
473show status like "Qcache_queries_in_cache";
474Variable_name Value
475Qcache_queries_in_cache 14
476show status like "Qcache_inserts";
477Variable_name Value
478Qcache_inserts 14
479show status like "Qcache_hits";
480Variable_name Value
481Qcache_hits 9
482select */* internal comment with "quote" */from t1;
483a
4841
4852
4863
487select */* internal comment with "quote" */from t1;
488a
4891
4902
4913
492show status like "Qcache_queries_in_cache";
493Variable_name Value
494Qcache_queries_in_cache 15
495show status like "Qcache_inserts";
496Variable_name Value
497Qcache_inserts 15
498show status like "Qcache_hits";
499Variable_name Value
500Qcache_hits 10
501-----------------------------------------------------
502select * from t1
503
504-----------------------------------------------------
505show status like "Qcache_queries_in_cache";
506Variable_name Value
507Qcache_queries_in_cache 15
508show status like "Qcache_inserts";
509Variable_name Value
510Qcache_inserts 15
511show status like "Qcache_hits";
512Variable_name Value
513Qcache_hits 10
514select * from t1
515;
516a
5171
5182
5193
520select * from t1
521;
522a
5231
5242
5253
526show status like "Qcache_queries_in_cache";
527Variable_name Value
528Qcache_queries_in_cache 16
529show status like "Qcache_inserts";
530Variable_name Value
531Qcache_inserts 16
532show status like "Qcache_hits";
533Variable_name Value
534Qcache_hits 11
535-----------------------------------------------------
536select * from t1
537-----------------------------------------------------
538show status like "Qcache_queries_in_cache";
539Variable_name Value
540Qcache_queries_in_cache 16
541show status like "Qcache_inserts";
542Variable_name Value
543Qcache_inserts 16
544show status like "Qcache_hits";
545Variable_name Value
546Qcache_hits 11
547select * from t1 ;
548a
5491
5502
5513
552select * from t1 ;
553a
5541
5552
5563
557show status like "Qcache_queries_in_cache";
558Variable_name Value
559Qcache_queries_in_cache 16
560show status like "Qcache_inserts";
561Variable_name Value
562Qcache_inserts 16
563show status like "Qcache_hits";
564Variable_name Value
565Qcache_hits 13
566-----------------------------------------------------
567select * from t1
568-----------------------------------------------------
569show status like "Qcache_queries_in_cache";
570Variable_name Value
571Qcache_queries_in_cache 16
572show status like "Qcache_inserts";
573Variable_name Value
574Qcache_inserts 16
575show status like "Qcache_hits";
576Variable_name Value
577Qcache_hits 13
578select * from t1 ;
579a
5801
5812
5823
583select * from t1 ;
584a
5851
5862
5873
588show status like "Qcache_queries_in_cache";
589Variable_name Value
590Qcache_queries_in_cache 16
591show status like "Qcache_inserts";
592Variable_name Value
593Qcache_inserts 16
594show status like "Qcache_hits";
595Variable_name Value
596Qcache_hits 15
597-----------------------------------------------------
598select * from t1
599/* comment in the end */
600-----------------------------------------------------
601show status like "Qcache_queries_in_cache";
602Variable_name Value
603Qcache_queries_in_cache 16
604show status like "Qcache_inserts";
605Variable_name Value
606Qcache_inserts 16
607show status like "Qcache_hits";
608Variable_name Value
609Qcache_hits 15
610select * from t1
611/* comment in the end */;
612a
6131
6142
6153
616select * from t1
617/* comment in the end */;
618a
6191
6202
6213
622show status like "Qcache_queries_in_cache";
623Variable_name Value
624Qcache_queries_in_cache 17
625show status like "Qcache_inserts";
626Variable_name Value
627Qcache_inserts 17
628show status like "Qcache_hits";
629Variable_name Value
630Qcache_hits 16
631-----------------------------------------------------
632select * from t1
633/* *\/ */
634-----------------------------------------------------
635show status like "Qcache_queries_in_cache";
636Variable_name Value
637Qcache_queries_in_cache 17
638show status like "Qcache_inserts";
639Variable_name Value
640Qcache_inserts 17
641show status like "Qcache_hits";
642Variable_name Value
643Qcache_hits 16
644select * from t1
645/* *\/ */;
646a
6471
6482
6493
650select * from t1
651/* *\/ */;
652a
6531
6542
6553
656show status like "Qcache_queries_in_cache";
657Variable_name Value
658Qcache_queries_in_cache 18
659show status like "Qcache_inserts";
660Variable_name Value
661Qcache_inserts 18
662show status like "Qcache_hits";
663Variable_name Value
664Qcache_hits 17
665-----------------------------------------------------
666select * from t1
667/* comment in the end */
668
669-----------------------------------------------------
670show status like "Qcache_queries_in_cache";
671Variable_name Value
672Qcache_queries_in_cache 18
673show status like "Qcache_inserts";
674Variable_name Value
675Qcache_inserts 18
676show status like "Qcache_hits";
677Variable_name Value
678Qcache_hits 17
679select * from t1
680/* comment in the end */
681;
682a
6831
6842
6853
686select * from t1
687/* comment in the end */
688;
689a
6901
6912
6923
693show status like "Qcache_queries_in_cache";
694Variable_name Value
695Qcache_queries_in_cache 18
696show status like "Qcache_inserts";
697Variable_name Value
698Qcache_inserts 18
699show status like "Qcache_hits";
700Variable_name Value
701Qcache_hits 19
702-----------------------------------------------------
703select * from t1 #comment in the end
704-----------------------------------------------------
705show status like "Qcache_queries_in_cache";
706Variable_name Value
707Qcache_queries_in_cache 18
708show status like "Qcache_inserts";
709Variable_name Value
710Qcache_inserts 18
711show status like "Qcache_hits";
712Variable_name Value
713Qcache_hits 19
714select * from t1 #comment in the end;
715a
7161
7172
7183
719select * from t1 #comment in the end;
720a
7211
7222
7233
724show status like "Qcache_queries_in_cache";
725Variable_name Value
726Qcache_queries_in_cache 19
727show status like "Qcache_inserts";
728Variable_name Value
729Qcache_inserts 19
730show status like "Qcache_hits";
731Variable_name Value
732Qcache_hits 20
733-----------------------------------------------------
734select * from t1 #comment in the end
735
736-----------------------------------------------------
737show status like "Qcache_queries_in_cache";
738Variable_name Value
739Qcache_queries_in_cache 19
740show status like "Qcache_inserts";
741Variable_name Value
742Qcache_inserts 19
743show status like "Qcache_hits";
744Variable_name Value
745Qcache_hits 20
746select * from t1 #comment in the end
747;
748a
7491
7502
7513
752select * from t1 #comment in the end
753;
754a
7551
7562
7573
758show status like "Qcache_queries_in_cache";
759Variable_name Value
760Qcache_queries_in_cache 19
761show status like "Qcache_inserts";
762Variable_name Value
763Qcache_inserts 19
764show status like "Qcache_hits";
765Variable_name Value
766Qcache_hits 22
767-----------------------------------------------------
768select * from t1 -- comment in the end
769-----------------------------------------------------
770show status like "Qcache_queries_in_cache";
771Variable_name Value
772Qcache_queries_in_cache 19
773show status like "Qcache_inserts";
774Variable_name Value
775Qcache_inserts 19
776show status like "Qcache_hits";
777Variable_name Value
778Qcache_hits 22
779select * from t1 -- comment in the end;
780a
7811
7822
7833
784select * from t1 -- comment in the end;
785a
7861
7872
7883
789show status like "Qcache_queries_in_cache";
790Variable_name Value
791Qcache_queries_in_cache 20
792show status like "Qcache_inserts";
793Variable_name Value
794Qcache_inserts 20
795show status like "Qcache_hits";
796Variable_name Value
797Qcache_hits 23
798-----------------------------------------------------
799select * from t1 -- comment in the end
800
801-----------------------------------------------------
802show status like "Qcache_queries_in_cache";
803Variable_name Value
804Qcache_queries_in_cache 20
805show status like "Qcache_inserts";
806Variable_name Value
807Qcache_inserts 20
808show status like "Qcache_hits";
809Variable_name Value
810Qcache_hits 23
811select * from t1 -- comment in the end
812;
813a
8141
8152
8163
817select * from t1 -- comment in the end
818;
819a
8201
8212
8223
823show status like "Qcache_queries_in_cache";
824Variable_name Value
825Qcache_queries_in_cache 20
826show status like "Qcache_inserts";
827Variable_name Value
828Qcache_inserts 20
829show status like "Qcache_hits";
830Variable_name Value
831Qcache_hits 25
832-----------------------------------------------------
833select ' \' ' from t1
834-----------------------------------------------------
835show status like "Qcache_queries_in_cache";
836Variable_name Value
837Qcache_queries_in_cache 20
838show status like "Qcache_inserts";
839Variable_name Value
840Qcache_inserts 20
841show status like "Qcache_hits";
842Variable_name Value
843Qcache_hits 25
844select ' \' ' from t1;
845'
846 '
847 '
848 '
849select ' \' ' from t1;
850'
851 '
852 '
853 '
854show status like "Qcache_queries_in_cache";
855Variable_name Value
856Qcache_queries_in_cache 21
857show status like "Qcache_inserts";
858Variable_name Value
859Qcache_inserts 21
860show status like "Qcache_hits";
861Variable_name Value
862Qcache_hits 26
863DROP TABLE t1;
864SET GLOBAL query_cache_size=default;
865set global query_cache_strip_comments=OFF;
0866
=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 2012-04-18 23:25:43 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result 1970-01-01 00:00:00 +0000
@@ -1,865 +0,0 @@
1set GLOBAL query_cache_size=1355776;
2drop table if exists t1;
3create table t1 (a int not null);
4insert into t1 values (1),(2),(3);
5flush query cache;
6flush query cache;
7reset query cache;
8flush status;
9flush query cache;
10flush query cache;
11reset query cache;
12flush status;
13/* with comment first */select * from t1;
14a
151
162
173
18-----------------------------------------------------
19/* with comment first */select * from t1
20-----------------------------------------------------
21show status like "Qcache_queries_in_cache";
22Variable_name Value
23Qcache_queries_in_cache 1
24show status like "Qcache_inserts";
25Variable_name Value
26Qcache_inserts 1
27show status like "Qcache_hits";
28Variable_name Value
29Qcache_hits 0
30/* with comment first */select * from t1;
31a
321
332
343
35/* with comment first */select * from t1;
36a
371
382
393
40show status like "Qcache_queries_in_cache";
41Variable_name Value
42Qcache_queries_in_cache 1
43show status like "Qcache_inserts";
44Variable_name Value
45Qcache_inserts 1
46show status like "Qcache_hits";
47Variable_name Value
48Qcache_hits 2
49-----------------------------------------------------
50# with comment first
51select * from t1
52-----------------------------------------------------
53show status like "Qcache_queries_in_cache";
54Variable_name Value
55Qcache_queries_in_cache 1
56show status like "Qcache_inserts";
57Variable_name Value
58Qcache_inserts 1
59show status like "Qcache_hits";
60Variable_name Value
61Qcache_hits 2
62# with comment first
63select * from t1;
64a
651
662
673
68# with comment first
69select * from t1;
70a
711
722
733
74show status like "Qcache_queries_in_cache";
75Variable_name Value
76Qcache_queries_in_cache 2
77show status like "Qcache_inserts";
78Variable_name Value
79Qcache_inserts 2
80show status like "Qcache_hits";
81Variable_name Value
82Qcache_hits 2
83-----------------------------------------------------
84-- with comment first
85select * from t1
86-----------------------------------------------------
87show status like "Qcache_queries_in_cache";
88Variable_name Value
89Qcache_queries_in_cache 2
90show status like "Qcache_inserts";
91Variable_name Value
92Qcache_inserts 2
93show status like "Qcache_hits";
94Variable_name Value
95Qcache_hits 2
96-- with comment first
97select * from t1;
98a
991
1002
1013
102-- with comment first
103select * from t1;
104a
1051
1062
1073
108show status like "Qcache_queries_in_cache";
109Variable_name Value
110Qcache_queries_in_cache 3
111show status like "Qcache_inserts";
112Variable_name Value
113Qcache_inserts 3
114show status like "Qcache_hits";
115Variable_name Value
116Qcache_hits 2
117-----------------------------------------------------
118/* with comment first and "quote" */select * from t1
119-----------------------------------------------------
120show status like "Qcache_queries_in_cache";
121Variable_name Value
122Qcache_queries_in_cache 3
123show status like "Qcache_inserts";
124Variable_name Value
125Qcache_inserts 3
126show status like "Qcache_hits";
127Variable_name Value
128Qcache_hits 2
129/* with comment first and "quote" */select * from t1;
130a
1311
1322
1333
134/* with comment first and "quote" */select * from t1;
135a
1361
1372
1383
139show status like "Qcache_queries_in_cache";
140Variable_name Value
141Qcache_queries_in_cache 4
142show status like "Qcache_inserts";
143Variable_name Value
144Qcache_inserts 4
145show status like "Qcache_hits";
146Variable_name Value
147Qcache_hits 3
148-----------------------------------------------------
149# with comment first and "quote"
150select * from t1
151-----------------------------------------------------
152show status like "Qcache_queries_in_cache";
153Variable_name Value
154Qcache_queries_in_cache 4
155show status like "Qcache_inserts";
156Variable_name Value
157Qcache_inserts 4
158show status like "Qcache_hits";
159Variable_name Value
160Qcache_hits 3
161# with comment first and "quote"
162select * from t1;
163a
1641
1652
1663
167# with comment first and "quote"
168select * from t1;
169a
1701
1712
1723
173show status like "Qcache_queries_in_cache";
174Variable_name Value
175Qcache_queries_in_cache 5
176show status like "Qcache_inserts";
177Variable_name Value
178Qcache_inserts 5
179show status like "Qcache_hits";
180Variable_name Value
181Qcache_hits 3
182-----------------------------------------------------
183-- with comment first and "quote"
184select * from t1
185-----------------------------------------------------
186show status like "Qcache_queries_in_cache";
187Variable_name Value
188Qcache_queries_in_cache 5
189show status like "Qcache_inserts";
190Variable_name Value
191Qcache_inserts 5
192show status like "Qcache_hits";
193Variable_name Value
194Qcache_hits 3
195-- with comment first and "quote"
196select * from t1;
197a
1981
1992
2003
201-- with comment first and "quote"
202select * from t1;
203a
2041
2052
2063
207show status like "Qcache_queries_in_cache";
208Variable_name Value
209Qcache_queries_in_cache 6
210show status like "Qcache_inserts";
211Variable_name Value
212Qcache_inserts 6
213show status like "Qcache_hits";
214Variable_name Value
215Qcache_hits 3
216-----------------------------------------------------
217/* with comment and whitespaces first */select * from t1
218-----------------------------------------------------
219show status like "Qcache_queries_in_cache";
220Variable_name Value
221Qcache_queries_in_cache 6
222show status like "Qcache_inserts";
223Variable_name Value
224Qcache_inserts 6
225show status like "Qcache_hits";
226Variable_name Value
227Qcache_hits 3
228/* with comment and whitespaces first */select * from t1;
229a
2301
2312
2323
233/* with comment and whitespaces first */select * from t1;
234a
2351
2362
2373
238show status like "Qcache_queries_in_cache";
239Variable_name Value
240Qcache_queries_in_cache 7
241show status like "Qcache_inserts";
242Variable_name Value
243Qcache_inserts 7
244show status like "Qcache_hits";
245Variable_name Value
246Qcache_hits 4
247-----------------------------------------------------
248# with comment and whitespaces first
249select * from t1
250-----------------------------------------------------
251show status like "Qcache_queries_in_cache";
252Variable_name Value
253Qcache_queries_in_cache 7
254show status like "Qcache_inserts";
255Variable_name Value
256Qcache_inserts 7
257show status like "Qcache_hits";
258Variable_name Value
259Qcache_hits 4
260# with comment and whitespaces first
261select * from t1;
262a
2631
2642
2653
266# with comment and whitespaces first
267select * from t1;
268a
2691
2702
2713
272show status like "Qcache_queries_in_cache";
273Variable_name Value
274Qcache_queries_in_cache 8
275show status like "Qcache_inserts";
276Variable_name Value
277Qcache_inserts 8
278show status like "Qcache_hits";
279Variable_name Value
280Qcache_hits 4
281-----------------------------------------------------
282-- with comment and whitespaces first
283select * from t1
284-----------------------------------------------------
285show status like "Qcache_queries_in_cache";
286Variable_name Value
287Qcache_queries_in_cache 8
288show status like "Qcache_inserts";
289Variable_name Value
290Qcache_inserts 8
291show status like "Qcache_hits";
292Variable_name Value
293Qcache_hits 4
294-- with comment and whitespaces first
295select * from t1;
296a
2971
2982
2993
300-- with comment and whitespaces first
301select * from t1;
302a
3031
3042
3053
306show status like "Qcache_queries_in_cache";
307Variable_name Value
308Qcache_queries_in_cache 9
309show status like "Qcache_inserts";
310Variable_name Value
311Qcache_inserts 9
312show status like "Qcache_hits";
313Variable_name Value
314Qcache_hits 4
315-----------------------------------------------------
316select * /* internal comment */ from t1
317-----------------------------------------------------
318show status like "Qcache_queries_in_cache";
319Variable_name Value
320Qcache_queries_in_cache 9
321show status like "Qcache_inserts";
322Variable_name Value
323Qcache_inserts 9
324show status like "Qcache_hits";
325Variable_name Value
326Qcache_hits 4
327select * /* internal comment */ from t1;
328a
3291
3302
3313
332select * /* internal comment */ from t1;
333a
3341
3352
3363
337show status like "Qcache_queries_in_cache";
338Variable_name Value
339Qcache_queries_in_cache 10
340show status like "Qcache_inserts";
341Variable_name Value
342Qcache_inserts 10
343show status like "Qcache_hits";
344Variable_name Value
345Qcache_hits 5
346-----------------------------------------------------
347select */* internal comment */ from t1
348-----------------------------------------------------
349show status like "Qcache_queries_in_cache";
350Variable_name Value
351Qcache_queries_in_cache 10
352show status like "Qcache_inserts";
353Variable_name Value
354Qcache_inserts 10
355show status like "Qcache_hits";
356Variable_name Value
357Qcache_hits 5
358select */* internal comment */ from t1;
359a
3601
3612
3623
363select */* internal comment */ from t1;
364a
3651
3662
3673
368show status like "Qcache_queries_in_cache";
369Variable_name Value
370Qcache_queries_in_cache 11
371show status like "Qcache_inserts";
372Variable_name Value
373Qcache_inserts 11
374show status like "Qcache_hits";
375Variable_name Value
376Qcache_hits 6
377-----------------------------------------------------
378select */* internal comment */from t1
379-----------------------------------------------------
380show status like "Qcache_queries_in_cache";
381Variable_name Value
382Qcache_queries_in_cache 11
383show status like "Qcache_inserts";
384Variable_name Value
385Qcache_inserts 11
386show status like "Qcache_hits";
387Variable_name Value
388Qcache_hits 6
389select */* internal comment */from t1;
390a
3911
3922
3933
394select */* internal comment */from t1;
395a
3961
3972
3983
399show status like "Qcache_queries_in_cache";
400Variable_name Value
401Qcache_queries_in_cache 12
402show status like "Qcache_inserts";
403Variable_name Value
404Qcache_inserts 12
405show status like "Qcache_hits";
406Variable_name Value
407Qcache_hits 7
408-----------------------------------------------------
409select * /* internal comment with "quote" */ from t1
410-----------------------------------------------------
411show status like "Qcache_queries_in_cache";
412Variable_name Value
413Qcache_queries_in_cache 12
414show status like "Qcache_inserts";
415Variable_name Value
416Qcache_inserts 12
417show status like "Qcache_hits";
418Variable_name Value
419Qcache_hits 7
420select * /* internal comment with "quote" */ from t1;
421a
4221
4232
4243
425select * /* internal comment with "quote" */ from t1;
426a
4271
4282
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches