diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/suite/perfschema_stress | |
parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/suite/perfschema_stress')
-rw-r--r-- | mysql-test/suite/perfschema_stress/r/modify.result | 24 | ||||
-rw-r--r-- | mysql-test/suite/perfschema_stress/t/modify.test | 16 | ||||
-rw-r--r-- | mysql-test/suite/perfschema_stress/t/read.test | 16 | ||||
-rw-r--r-- | mysql-test/suite/perfschema_stress/t/setup.test | 8 |
4 files changed, 32 insertions, 32 deletions
diff --git a/mysql-test/suite/perfschema_stress/r/modify.result b/mysql-test/suite/perfschema_stress/r/modify.result index e1a79c9be2a..b5f6336c8ce 100644 --- a/mysql-test/suite/perfschema_stress/r/modify.result +++ b/mysql-test/suite/perfschema_stress/r/modify.result @@ -1,17 +1,17 @@ -UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'NO'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO'; -UPDATE performance_schema.SETUP_TIMERS +UPDATE performance_schema.setup_instruments SET TIMED = 'NO'; +UPDATE performance_schema.setup_instruments SET ENABLED = 'NO'; +UPDATE performance_schema.setup_timers SET TIMER_NAME = 'NANOSECOND' WHERE NAME = 'Wait'; -UPDATE performance_schema.SETUP_TIMERS +UPDATE performance_schema.setup_timers SET TIMER_NAME = 'CYCLE' WHERE NAME = 'Wait'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES' -WHERE NAME IN ('wait/io/file/sql/FRM', -'thread/sql/Connection', -'wait/synch/cond/sql/COND_mdl', -'wait/synch/rwlock/sql/LOCK_sys_init_connect', +UPDATE performance_schema.setup_instruments SET TIMED = 'YES'; +UPDATE performance_schema.setup_instruments SET ENABLED = 'YES' +WHERE NAME IN ('wait/io/file/sql/FRM', +'thread/sql/Connection', +'wait/synch/cond/sql/COND_mdl', +'wait/synch/rwlock/sql/LOCK_sys_init_connect', 'wait/synch/mutex/sql/LOCK_mdl'); -UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'NO' +UPDATE performance_schema.setup_consumers SET ENABLED = 'NO' WHERE NAME = 'events_waits_history'; -UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES' +UPDATE performance_schema.setup_consumers SET ENABLED = 'YES' WHERE NAME = 'events_waits_history'; diff --git a/mysql-test/suite/perfschema_stress/t/modify.test b/mysql-test/suite/perfschema_stress/t/modify.test index f37255c6b09..0c254818cf2 100644 --- a/mysql-test/suite/perfschema_stress/t/modify.test +++ b/mysql-test/suite/perfschema_stress/t/modify.test @@ -23,22 +23,22 @@ if (!$have_table) { --source suite/perfschema_stress/t/setup.test } -UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'NO'; +UPDATE performance_schema.setup_instruments SET TIMED = 'NO'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO'; +UPDATE performance_schema.setup_instruments SET ENABLED = 'NO'; -UPDATE performance_schema.SETUP_TIMERS +UPDATE performance_schema.setup_timers SET TIMER_NAME = 'NANOSECOND' WHERE NAME = 'Wait'; # Let it run some time with the new timer name and instruments --sleep 1 -UPDATE performance_schema.SETUP_TIMERS +UPDATE performance_schema.setup_timers SET TIMER_NAME = 'CYCLE' WHERE NAME = 'Wait'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES'; +UPDATE performance_schema.setup_instruments SET TIMED = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES' +UPDATE performance_schema.setup_instruments SET ENABLED = 'YES' WHERE NAME IN ('wait/io/file/sql/FRM', 'thread/sql/Connection', 'wait/synch/cond/sql/COND_mdl', @@ -48,8 +48,8 @@ WHERE NAME IN ('wait/io/file/sql/FRM', # Two short lived changes to see that switching does not lead # to havoc. -UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'NO' +UPDATE performance_schema.setup_consumers SET ENABLED = 'NO' WHERE NAME = 'events_waits_history'; -UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES' +UPDATE performance_schema.setup_consumers SET ENABLED = 'YES' WHERE NAME = 'events_waits_history'; diff --git a/mysql-test/suite/perfschema_stress/t/read.test b/mysql-test/suite/perfschema_stress/t/read.test index 28ba4d8d887..12dc1357357 100644 --- a/mysql-test/suite/perfschema_stress/t/read.test +++ b/mysql-test/suite/perfschema_stress/t/read.test @@ -15,24 +15,24 @@ --source include/not_embedded.inc -SELECT * FROM performance_schema.SETUP_INSTRUMENTS +SELECT * FROM performance_schema.setup_instruments WHERE ENABLED='NO' AND TIMED='NO'; -SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT * FROM performance_schema.events_waits_current WHERE (TIMER_END - TIMER_START != TIMER_WAIT); -SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY +SELECT * FROM performance_schema.events_waits_history WHERE SPINS != NULL; -SELECT * FROM performance_schema.PROCESSLIST p, - performance_schema.EVENTS_WAITS_CURRENT e +SELECT * FROM performance_schema.processlist p, + performance_schema.events_waits_current e WHERE p.THREAD_ID = e.THREAD_ID AND TIMER_START = 0 ORDER BY e.EVENT_ID; -SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT * FROM performance_schema.events_waits_current WHERE THREAD_ID IN (SELECT THREAD_ID - FROM performance_schema.PROCESSLIST + FROM performance_schema.processlist ORDER BY THREAD_ID) AND TIMER_END = 0 AND TIMER_WAIT != NULL @@ -43,7 +43,7 @@ SELECT SUM(COUNT_READ) AS sum_count_read, SUM(COUNT_WRITE) AS sum_count_write, SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read, SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write -FROM performance_schema.FILE_SUMMARY_BY_INSTANCE +FROM performance_schema.file_summary_by_instance WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL; --enable_result_log diff --git a/mysql-test/suite/perfschema_stress/t/setup.test b/mysql-test/suite/perfschema_stress/t/setup.test index e55ed5e8630..c745463f097 100644 --- a/mysql-test/suite/perfschema_stress/t/setup.test +++ b/mysql-test/suite/perfschema_stress/t/setup.test @@ -48,17 +48,17 @@ while (`SELECT MAX(id) < $num_stress_rows FROM t1`) # Turn on some instruments -UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES'; +UPDATE performance_schema.setup_instruments SET TIMED = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES' +UPDATE performance_schema.setup_instruments SET ENABLED = 'NO'; +UPDATE performance_schema.setup_instruments SET ENABLED = 'YES' WHERE NAME IN ('wait/io/file/sql/FRM', 'thread/sql/Connection', 'wait/synch/cond/sql/COND_mdl', 'wait/synch/rwlock/sql/LOCK_sys_init_connect', 'wait/synch/mutex/sql/LOCK_mdl'); -UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES'; +UPDATE performance_schema.setup_consumers SET ENABLED = 'YES'; --enable_result_log --enable_query_log |