bzr push into mysql-5.1-bugteam branch (davi:2768 to 2769) Bug#34517

[Davi Arnaut]

 2769 Davi Arnaut	2009-01-31
      Remove duplicated test for Bug#34517
modified:
  mysql-test/r/change_user.result
  mysql-test/r/not_embedded_server.result
  mysql-test/t/change_user.test
  mysql-test/t/not_embedded_server.test

 2768 Luis Soares	2009-01-31
      BUG#35583: mysqlbinlog replay fails with ERROR 1146 when temp tables are used
            
      The test case proposed by the bugfix fails in bugteam trees after merging new 
      mtr from main. The failure is due to the fact that the binlog file location has
      changed and is no more under $MYSQLTEST_VARDIR/log.
            
      This patch fixes the test failure by setting the correct path to the binlog 
      file.
modified:
  mysql-test/suite/binlog/t/binlog_tmp_table.test

=== modified file 'mysql-test/r/change_user.result'
--- a/mysql-test/r/change_user.result	2009-01-31 12:15:49 +0000
+++ b/mysql-test/r/change_user.result	2009-02-01 00:04:57 +0000
@@ -45,9 +45,4 @@ SELECT IS_USED_LOCK('bug31418');
 IS_USED_LOCK('bug31418')
 NULL
 FLUSH STATUS;
-SHOW GLOBAL STATUS LIKE 'com_select';
-Variable_name	Value
-Com_select	117
-SHOW GLOBAL STATUS LIKE 'com_select';
-Variable_name	Value
-Com_select	117
+Value of com_select did not change

=== modified file 'mysql-test/r/not_embedded_server.result'
--- a/mysql-test/r/not_embedded_server.result	2009-01-31 12:15:49 +0000
+++ b/mysql-test/r/not_embedded_server.result	2009-02-01 00:04:57 +0000
@@ -1,2 +1,3 @@
-FLUSH STATUS;
-Value of com_select did not change
+select 1;
+1
+1

=== modified file 'mysql-test/t/change_user.test'
--- a/mysql-test/t/change_user.test	2009-01-15 09:56:05 +0000
+++ b/mysql-test/t/change_user.test	2009-02-01 00:04:57 +0000
@@ -63,8 +63,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;

=== modified file 'mysql-test/t/not_embedded_server.test'
--- a/mysql-test/t/not_embedded_server.test	2009-01-31 12:15:49 +0000
+++ b/mysql-test/t/not_embedded_server.test	2009-02-01 00:04:57 +0000
@@ -4,6 +4,11 @@
 
 -- source include/not_embedded.inc
 
+#
+# Produce output
+#
+
+select 1;
 
 # The following fails sporadically because 'check-testcase' runs
 # queries before this test and there is no way to guarantee that any
@@ -31,45 +36,4 @@
 #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
-
-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