1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge backport of patch for Bug#31222 from 5.0 to 5.1

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-01-15 12:56:05 +03:00
commit 91e5423c64
4 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/change_user.result
View File

@ -44,3 +44,10 @@ 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

7
mysql-test/r/not_embedded_server.result
View File

@ -3,10 +3,3 @@ 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

29
mysql-test/t/change_user.test
View File

@ -45,9 +45,26 @@ 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
# not work properly in embedded server. FLUSH STATUS;
#
# TODO: move it back when Bug#34517 is fixed (don't forget to add --disable_result_log
# --force-restart into change_user-master.opt). --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';

34
mysql-test/t/not_embedded_server.test
View File

@ -20,38 +20,4 @@ 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