From e5d859fab7e5973731b0816339b2a2714571487e Mon Sep 17 00:00:00 2001
From: Matthias Leich <Matthias.Leich@sun.com>
Date: Thu, 30 Apr 2009 12:26:11 +0200
Subject: [PATCH] Merge of fix for Bug#44522 main.not_embedded_server fails
 with "--check-testcases" into actual tree

---
 mysql-test/r/not_embedded_server.result |  7 +------
 mysql-test/t/not_embedded_server.test   | 10 ++++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result
index edb698ade83..69175ca446f 100644
--- a/mysql-test/r/not_embedded_server.result
+++ b/mysql-test/r/not_embedded_server.result
@@ -4,9 +4,4 @@ Id	User	Host	db	Command	Time	State	Info
 number	root	localhost	test	Query	time	NULL	show full processlist
 deallocate prepare stmt1;
 FLUSH STATUS;
-SHOW GLOBAL STATUS LIKE 'com_select';
-Variable_name	Value
-Com_select	101
-SHOW GLOBAL STATUS LIKE 'com_select';
-Variable_name	Value
-Com_select	101
+Value of com_select did not change
diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test
index 044d8665a18..fcbcc389b15 100644
--- a/mysql-test/t/not_embedded_server.test
+++ b/mysql-test/t/not_embedded_server.test
@@ -39,8 +39,14 @@ while ($i)
 --enable_query_log
 --enable_result_log
 
-SHOW GLOBAL STATUS LIKE 'com_select';
+let $before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1);
 
 --change_user
 
-SHOW GLOBAL STATUS LIKE 'com_select';
+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;