From 2b3a53a352dd3334ef40085773ca3f5ff78337cd Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Sat, 31 Jan 2009 14:15:49 +0200
Subject: [PATCH] fixed bad merge of 5.1-main -> 5.1-bugteam

---
 mysql-test/r/change_user.result         |  4 +--
 mysql-test/r/not_embedded_server.result |  2 ++
 mysql-test/t/not_embedded_server.test   | 40 +++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result
index 70da464a612..096388ec611 100644
--- a/mysql-test/r/change_user.result
+++ b/mysql-test/r/change_user.result
@@ -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
diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result
index e69de29bb2d..4373d6356d9 100644
--- a/mysql-test/r/not_embedded_server.result
+++ b/mysql-test/r/not_embedded_server.result
@@ -0,0 +1,2 @@
+FLUSH STATUS;
+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 4c7bbbda877..562194a62a4 100644
--- a/mysql-test/t/not_embedded_server.test
+++ b/mysql-test/t/not_embedded_server.test
@@ -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