database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

fixed bad merge of 5.1-main -> 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2009-01-31 14:15:49 +02:00
parent c4d30c9b5a
commit 2b3a53a352
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ NULL
FLUSH STATUS;
SHOW GLOBAL STATUS LIKE 'com_select';
Variable_name Value
Com_select 112
Com_select 117
SHOW GLOBAL STATUS LIKE 'com_select';
Variable_name Value
Com_select 112
Com_select 117

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

@ -0,0 +1,2 @@
FLUSH STATUS;
Value of com_select did not change

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

@ -32,4 +32,44 @@
#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
let $before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1);
--change_user
let $after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1);
if (`select $after != $before`){
SHOW GLOBAL STATUS LIKE 'com_select';
die The value of com_select changed during change_user;
}
echo Value of com_select did not change;
# End of 5.1 tests