bk commit into 5.1 tree (anozdrin:1.2550) BUG#31222

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of anozdrin.  When anozdrin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-13 13:00:24+03:00, anozdrin@quad. +5 -0
  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@stripped, 2008-02-13 12:57:39+03:00,
anozdrin@quad. +0 -0
    Delete: mysql-test/t/change_user-master.opt

  mysql-test/r/change_user.result@stripped, 2008-02-13 13:00:23+03:00, anozdrin@quad. +0 -7
    Move test case for Bug#31222 to not_embedded_server.test.

  mysql-test/r/not_embedded_server.result@stripped, 2008-02-13 13:00:23+03:00, anozdrin@quad.
+7 -0
    Move test case for Bug#31222 to not_embedded_server.test.

  mysql-test/t/change_user.test@stripped, 2008-02-13 13:00:23+03:00, anozdrin@quad. +6 -23
    Move test case for Bug#31222 to not_embedded_server.test.

  mysql-test/t/not_embedded_server.test@stripped, 2008-02-13 13:00:23+03:00, anozdrin@quad. +34
-0
    Move test case for Bug#31222 to not_embedded_server.test.

diff -Nrup a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result
--- a/mysql-test/r/change_user.result	2008-02-12 20:59:08 +03:00
+++ b/mysql-test/r/change_user.result	2008-02-13 13:00:23 +03:00
@@ -44,10 +44,3 @@ IS_FREE_LOCK('bug31418')
 SELECT IS_USED_LOCK('bug31418');
 IS_USED_LOCK('bug31418')
 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
diff -Nrup a/mysql-test/r/not_embedded_server.result
b/mysql-test/r/not_embedded_server.result
--- a/mysql-test/r/not_embedded_server.result	2007-05-02 22:13:30 +04:00
+++ b/mysql-test/r/not_embedded_server.result	2008-02-13 13:00:23 +03:00
@@ -3,3 +3,10 @@ execute stmt1;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 number	root	localhost	test	Query	time	executing	SELECT * FROM
INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon'
 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
diff -Nrup a/mysql-test/t/change_user-master.opt b/mysql-test/t/change_user-master.opt
--- a/mysql-test/t/change_user-master.opt	2008-02-12 21:42:14 +03:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1 +0,0 @@
---force-restart
diff -Nrup a/mysql-test/t/change_user.test b/mysql-test/t/change_user.test
--- a/mysql-test/t/change_user.test	2008-02-12 20:59:08 +03:00
+++ b/mysql-test/t/change_user.test	2008-02-13 13:00:23 +03:00
@@ -38,26 +38,9 @@ SELECT IS_USED_LOCK('bug31418');
 # Bug#31222: com_% global status counters behave randomly with
 # mysql_change_user.
 #
-
-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';
+# Moved to not_embedded_server.test due to Bug#34517: SHOW GLOBAL STATUS does
+# not work properly in embedded server.
+#
+# TODO: move it back when Bug#34517 is fixed (don't forget to add
+# --force-restart into change_user-master.opt).
+#
diff -Nrup a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test
--- a/mysql-test/t/not_embedded_server.test	2006-08-15 15:10:07 +04:00
+++ b/mysql-test/t/not_embedded_server.test	2008-02-13 13:00:23 +03:00
@@ -20,4 +20,38 @@ prepare stmt1 from ' SELECT * FROM INFOR
 execute 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