bzr commit into mysql-6.0 branch (Sergey.Glukhov:2923) Bug#36035

[Sergey Glukhov]

#At file:///home/gluh/MySQL/mysql-6.0-bugteam/

 2923 Sergey Glukhov	2008-11-13 [merge]
      5.1-bugteam->6.0-bugteam automerge(bug#36035)
modified:
  mysql-test/suite/funcs_1/datadict/is_tables.inc
  mysql-test/suite/funcs_1/r/is_tables.result

per-file messages:
  mysql-test/suite/funcs_1/datadict/is_tables.inc
    5.1-bugteam->6.0-bugteam automerge(bug#36035)
  mysql-test/suite/funcs_1/r/is_tables.result
    5.1-bugteam->6.0-bugteam automerge(bug#36035)
=== modified file 'mysql-test/suite/funcs_1/datadict/is_tables.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_tables.inc	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc	2008-11-13 08:38:30 +0000
@@ -346,6 +346,7 @@ WHERE table_name = 't1_my_tablex';
 #   Enforce a time difference bigger than the smallest unit (1 second).
 --real_sleep 1.1
 INSERT INTO db_datadict.t1_my_tablex SET f1 = 3;
+FLUSH TABLES;
 SELECT UPDATE_TIME > @UPDATE_TIME
     AS "Is current UPDATE_TIME bigger than before last INSERT?"
 FROM information_schema.tables

=== modified file 'mysql-test/suite/funcs_1/r/is_tables.result'
--- a/mysql-test/suite/funcs_1/r/is_tables.result	2008-09-23 08:39:48 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables.result	2008-11-13 08:54:02 +0000
@@ -314,6 +314,7 @@ SELECT UPDATE_TIME, checksum INTO @UPDAT
 FROM information_schema.tables
 WHERE table_name = 't1_my_tablex';
 INSERT INTO db_datadict.t1_my_tablex SET f1 = 3;
+FLUSH TABLES;
 SELECT UPDATE_TIME > @UPDATE_TIME
 AS "Is current UPDATE_TIME bigger than before last INSERT?"
 FROM information_schema.tables