mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Additional patch for Bug#31222: com_% global status counters
behave randomly with mysql_change_user. The test case had to be moved into not_embedded_server.test file, because SHOW GLOBAL STATUS does not work properly in embedded server (see bug 34517). BitKeeper/deleted/.del-change_user-master.opt: Delete: mysql-test/t/change_user-master.opt mysql-test/r/change_user.result: Move test case for Bug#31222 to not_embedded_server.test. mysql-test/r/not_embedded_server.result: Move test case for Bug#31222 to not_embedded_server.test. mysql-test/t/change_user.test: Move test case for Bug#31222 to not_embedded_server.test. mysql-test/t/not_embedded_server.test: Move test case for Bug#31222 to not_embedded_server.test.
This commit is contained in:
parent
f8c40728ed
commit
e40e60fe33
5 changed files with 47 additions and 31 deletions
|
@ -44,10 +44,3 @@ IS_FREE_LOCK('bug31418')
|
||||||
SELECT IS_USED_LOCK('bug31418');
|
SELECT IS_USED_LOCK('bug31418');
|
||||||
IS_USED_LOCK('bug31418')
|
IS_USED_LOCK('bug31418')
|
||||||
NULL
|
NULL
|
||||||
FLUSH STATUS;
|
|
||||||
SHOW GLOBAL STATUS LIKE 'com_select';
|
|
||||||
Variable_name Value
|
|
||||||
Com_select 112
|
|
||||||
SHOW GLOBAL STATUS LIKE 'com_select';
|
|
||||||
Variable_name Value
|
|
||||||
Com_select 112
|
|
||||||
|
|
|
@ -3,3 +3,10 @@ execute stmt1;
|
||||||
ID USER HOST DB COMMAND TIME STATE INFO
|
ID USER HOST DB COMMAND TIME STATE INFO
|
||||||
number root localhost test Query time executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon'
|
number root localhost test Query time executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon'
|
||||||
deallocate prepare stmt1;
|
deallocate prepare stmt1;
|
||||||
|
FLUSH STATUS;
|
||||||
|
SHOW GLOBAL STATUS LIKE 'com_select';
|
||||||
|
Variable_name Value
|
||||||
|
Com_select 102
|
||||||
|
SHOW GLOBAL STATUS LIKE 'com_select';
|
||||||
|
Variable_name Value
|
||||||
|
Com_select 102
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
--force-restart
|
|
|
@ -38,26 +38,9 @@ SELECT IS_USED_LOCK('bug31418');
|
||||||
# Bug#31222: com_% global status counters behave randomly with
|
# Bug#31222: com_% global status counters behave randomly with
|
||||||
# mysql_change_user.
|
# mysql_change_user.
|
||||||
#
|
#
|
||||||
|
# Moved to not_embedded_server.test due to Bug#34517: SHOW GLOBAL STATUS does
|
||||||
FLUSH STATUS;
|
# not work properly in embedded server.
|
||||||
|
#
|
||||||
--disable_result_log
|
# TODO: move it back when Bug#34517 is fixed (don't forget to add
|
||||||
--disable_query_log
|
# --force-restart into change_user-master.opt).
|
||||||
|
#
|
||||||
let $i = 100;
|
|
||||||
|
|
||||||
while ($i)
|
|
||||||
{
|
|
||||||
dec $i;
|
|
||||||
|
|
||||||
SELECT 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
--enable_query_log
|
|
||||||
--enable_result_log
|
|
||||||
|
|
||||||
SHOW GLOBAL STATUS LIKE 'com_select';
|
|
||||||
|
|
||||||
--change_user
|
|
||||||
|
|
||||||
SHOW GLOBAL STATUS LIKE 'com_select';
|
|
||||||
|
|
|
@ -20,4 +20,38 @@ prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!
|
||||||
execute stmt1;
|
execute stmt1;
|
||||||
deallocate prepare stmt1;
|
deallocate prepare stmt1;
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug#31222: com_% global status counters behave randomly with
|
||||||
|
# mysql_change_user.
|
||||||
|
#
|
||||||
|
# Moved from change_user.test due to Bug#34517: SHOW GLOBAL STATUS does not
|
||||||
|
# work properly in embedded server.
|
||||||
|
#
|
||||||
|
# TODO: move it back when Bug#34517 is fixed.
|
||||||
|
#
|
||||||
|
|
||||||
|
FLUSH STATUS;
|
||||||
|
|
||||||
|
--disable_result_log
|
||||||
|
--disable_query_log
|
||||||
|
|
||||||
|
let $i = 100;
|
||||||
|
|
||||||
|
while ($i)
|
||||||
|
{
|
||||||
|
dec $i;
|
||||||
|
|
||||||
|
SELECT 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
--enable_query_log
|
||||||
|
--enable_result_log
|
||||||
|
|
||||||
|
SHOW GLOBAL STATUS LIKE 'com_select';
|
||||||
|
|
||||||
|
--change_user
|
||||||
|
|
||||||
|
SHOW GLOBAL STATUS LIKE 'com_select';
|
||||||
|
|
||||||
# End of 5.1 tests
|
# End of 5.1 tests
|
||||||
|
|
Loading…
Reference in a new issue