mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge with 5.3

Browse source 
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
This commit is contained in:
Sergei Golubchik 2011-10-19 21:45:18 +02:00
commit 76f0b94bb0
1705 changed files with 166479 additions and 39785 deletions
Download patch file Download diff file Expand all files Collapse all files

24
mysql-test/suite/perfschema_stress/r/modify.result
View file

@ -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';

16
mysql-test/suite/perfschema_stress/t/modify.test
View file

@ -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';

16
mysql-test/suite/perfschema_stress/t/read.test
View file

@ -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

8
mysql-test/suite/perfschema_stress/t/setup.test
View file

@ -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