From: Marc Alff Date: May 4 2010 8:07am Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3161 to 3162) Bug#53392 List-Archive: http://lists.mysql.com/commits/107251 X-Bug: 53392 Message-Id: <20100504080726.4445952116C@MarcBook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_2KzsEJ4iXMm0NlL/Gr5+5w)" --Boundary_(ID_2KzsEJ4iXMm0NlL/Gr5+5w) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline 3162 Marc Alff 2010-05-04 Bug#53392 Tests: perfschema.query_cache fails Before this fix, the test perfschema.query_cache could fail with spurious failures, depending on which test was executed in the same MTR run. With this fix, the test perfschema.query_cache resets the server status variables, to be independent of previous runs. In particular, Qcache_hit now has a predictable value. modified: mysql-test/suite/perfschema/r/query_cache.result mysql-test/suite/perfschema/t/query_cache.test 3161 Marc Alff 2010-05-04 Fixed copyright modified: mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/privilege.inc mysql-test/suite/perfschema/include/setup_helper.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/t/aggregate.test mysql-test/suite/perfschema/t/bad_option_1.test mysql-test/suite/perfschema/t/bad_option_2.test mysql-test/suite/perfschema/t/binlog_mix.test mysql-test/suite/perfschema/t/binlog_row.test mysql-test/suite/perfschema/t/binlog_stmt.test mysql-test/suite/perfschema/t/cnf_option.cnf mysql-test/suite/perfschema/t/cnf_option.test mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/ddl_cond_instances.test mysql-test/suite/perfschema/t/ddl_events_waits_current.test mysql-test/suite/perfschema/t/ddl_events_waits_history.test mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test mysql-test/suite/perfschema/t/ddl_ews_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_by_instance.test mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_file_instances.test mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test mysql-test/suite/perfschema/t/ddl_fs_by_instance.test mysql-test/suite/perfschema/t/ddl_mutex_instances.test mysql-test/suite/perfschema/t/ddl_performance_timers.test mysql-test/suite/perfschema/t/ddl_processlist.test mysql-test/suite/perfschema/t/ddl_rwlock_instances.test mysql-test/suite/perfschema/t/ddl_setup_consumers.test mysql-test/suite/perfschema/t/ddl_setup_instruments.test mysql-test/suite/perfschema/t/ddl_setup_objects.test mysql-test/suite/perfschema/t/ddl_setup_timers.test mysql-test/suite/perfschema/t/disabled.def mysql-test/suite/perfschema/t/dml_cond_instances.test mysql-test/suite/perfschema/t/dml_events_waits_current.test mysql-test/suite/perfschema/t/dml_events_waits_history.test mysql-test/suite/perfschema/t/dml_events_waits_history_long.test mysql-test/suite/perfschema/t/dml_ews_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_by_instance.test mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_file_instances.test mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test mysql-test/suite/perfschema/t/dml_mutex_instances.test mysql-test/suite/perfschema/t/dml_performance_timers.test mysql-test/suite/perfschema/t/dml_processlist.test mysql-test/suite/perfschema/t/dml_rwlock_instances.test mysql-test/suite/perfschema/t/dml_setup_consumers.test mysql-test/suite/perfschema/t/dml_setup_instruments.test mysql-test/suite/perfschema/t/dml_setup_objects.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/perfschema/t/global_read_lock.test mysql-test/suite/perfschema/t/information_schema.test mysql-test/suite/perfschema/t/myisam_file_io.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/perfschema/t/privilege.test mysql-test/suite/perfschema/t/query_cache.test mysql-test/suite/perfschema/t/read_only.test mysql-test/suite/perfschema/t/schema.test mysql-test/suite/perfschema/t/selects.test mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/perfschema/t/start_server_no_cond_class.test mysql-test/suite/perfschema/t/start_server_no_cond_inst.test mysql-test/suite/perfschema/t/start_server_no_file_class.test mysql-test/suite/perfschema/t/start_server_no_file_inst.test mysql-test/suite/perfschema/t/start_server_no_mutex_class.test mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test mysql-test/suite/perfschema/t/start_server_no_thread_class.test mysql-test/suite/perfschema/t/start_server_no_thread_inst.test mysql-test/suite/perfschema/t/start_server_off.test mysql-test/suite/perfschema/t/start_server_on.test mysql-test/suite/perfschema/t/tampered_perfschema_table1.test === modified file 'mysql-test/suite/perfschema/r/query_cache.result' --- a/mysql-test/suite/perfschema/r/query_cache.result 2010-01-12 01:47:27 +0000 +++ b/mysql-test/suite/perfschema/r/query_cache.result 2010-05-04 07:44:13 +0000 @@ -4,6 +4,7 @@ insert into t1 values (1), (2), (3); SET GLOBAL query_cache_size=1355776; flush query cache; reset query cache; +flush status; select * from t1; a 1 === modified file 'mysql-test/suite/perfschema/t/query_cache.test' --- a/mysql-test/suite/perfschema/t/query_cache.test 2010-05-04 06:53:22 +0000 +++ b/mysql-test/suite/perfschema/t/query_cache.test 2010-05-04 07:44:13 +0000 @@ -33,6 +33,8 @@ SET GLOBAL query_cache_size=1355776; flush query cache; reset query cache; +# Reset Qcache_* to a known state +flush status; select * from t1; --Boundary_(ID_2KzsEJ4iXMm0NlL/Gr5+5w) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/marc.alff@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/marc.alff@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # 53392/ # testament_sha1: e496bb43f7ae935c4d3da2d50d3ea98872b1016b # timestamp: 2010-05-04 02:07:26 -0600 # base_revision_id: marc.alff@stripped\ # 86kc4r7hj3cyg87n # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcd0waIAAkNfgEAQWXf//3Ii NIC////wUAT4VvUDu2IVVtzWoSUk8kwmU9JtGp5MmiejQQaAAGQSSnqGQJppqaaG1GQGgNGgA0AS miCmRppR6YnkUxB6mmg9Riep5I0A5gEwAmAAEwABMAASSEaaBPU0ZGhGptI9CMI00ADS7P5ZzVLd ihfjVwJ4bLMjZWTXKmTS8pLgmGulFY2zy7Stvlxvt1N9SokmS5fcPzKkXwZpP7FoETvlbZ17tnTi r9dJeMOj+uc+g/lCkcauXHLGDNLuVcbKDo8c8jnYhxTCJaCc5nwlKdtdnyfe/V6/VUlEi8ng/X9G Z5YwAXdX1vLviufkM0GRNYoEKppEwxg/NPOBDtrvaKSnPRLeM0SQN2MhtbRog+wXisvOp3MjMKcQ umb6dwI1EiQOlCRJyw+gICn0ApSQFMok1QRYBi4coPKTuiVCyjeljFKlgVpzcljalvohc6+wDzqN kg1qhFJlRuDmvhsaC25Mj0hUCIJYltJrLSnAJE5SHYJ6IeAsyBQOJARA2yqdXWBSKUmDQxOoeUtI 6DcEB9sLLMqQcCZZUgSRtAheAyUzPNYF5YONhxAwNp/NQdopVNnNrAVR4QvUyioPLZkSMZxCJuMY 0lDV7BNWcAzpBxtJhI8mDdjFrd2mgvfE86gLtBJzi0NJoOISDRc4jTSVTKdRgFh2BMdXrIlZMYYt wM86sqxp7Cok1RVkl8cqyzwqp5dIOiTkPwG07E1iXiwp1sHElbMC19wiEkGHFvjdE3KJ43DN2RcJ JlzV6akzzX6UI2IGsTE2ZkOt7qKAieK4G8yFEXE3HQby8qHFpucawOdpN3wpGnShYtRKBsK75ikg RpVQGwSl5v2LHBTLRbYJTgRMf3tUIbqDQRlg8ZCcvNT5J1b+YtaWVJdZR3A8YbJTzQci4pFigNEb JZkjQmeyE3ES1DjrzFyDqeZWgeBcDw7B0SQHAxIFt/uLd6o8+XLYYHU5HF+bITxMXkl7eo0D+wtX aTqV9hYqEZj/TfTPNuJzisjCg1JhOHNplQuLA2KCM95+MIYkhN3vUl3uEdGcUR3GfDe8PixrGDgc s5AJYlWPkJpHLMksy9S4hRRGLAZ5431lW691bO8JgaUnw/XsPDh0mxzWAM8TXwE5MDAXMsPGB2+w HAL6EOymBnTVa6EBg8qc1iTBpjOKGYsPD8tbRkg0Z6RkDa/XnNROVILSBEWZSLrDFF2X3sRx1DTj EhPIe5SJJzWK6ZrZSDgJbV9+mxfA8DB6pWhG7KYWzq3b6eVaf7bEduocDFuGajGlKrUzSab1364r kKLCZQ5ncLGW1JUuYDtgj1QooqD0ctEqj4HHz8FiwwwB4TLIOqgsvcooGq72p9lomYZste+Piczg 1og0TpKTH0OBddYpruuUtZPUotRRSsz0hPOTRkE4mBe2Rk2CsVDTEEOJdBZg2x5tQhrmsYGIRDLH NQamSe9ilDhnkteu2tY2lYrc7dkkSBAOiKIPw03ramCVxuE8WXSnBYi4JucQYI3JzSLXVuoPXivx Z7FSzNHCYvTkLi65UTc0oiOm2JhaKjWRZhV3XCc5hHmA8N1rZVLpfLX/xdyRThQkMd0waIA= --Boundary_(ID_2KzsEJ4iXMm0NlL/Gr5+5w)--