bk commit into 5.1 tree (hhunger:1.2588) BUG#35988

[horst]

Below is the list of changes that have just been committed into a local
5.1 repository of hhunger.  When hhunger 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-04-21 13:52:58+02:00, hhunger@stripped +6 -0
  seventh set of fixed for bug#35988.

  BitKeeper/etc/ignore@stripped, 2008-04-21 13:52:50+02:00, hhunger@stripped +1 -0
    Added libmysqld/.deps/item_create.Tpo to the ignore list

  mysql-test/r/query_cache_wlock_invalidate_func.result@stripped, 2008-04-21 13:52:50+02:00, hhunger@stripped +2 -2
    seventh set of fixed for bug#35988.

  mysql-test/r/timestamp_func.result@stripped, 2008-04-21 13:52:50+02:00, hhunger@stripped +2 -2
    seventh set of fixed for bug#35988.

  mysql-test/t/innodb_table_locks_func.test@stripped, 2008-04-21 13:52:50+02:00, hhunger@stripped +2 -0
    seventh set of fixed for bug#35988.

  mysql-test/t/query_cache_wlock_invalidate_func.test@stripped, 2008-04-21 13:52:50+02:00, hhunger@stripped +1 -1
    seventh set of fixed for bug#35988.

  mysql-test/t/timestamp_func.test@stripped, 2008-04-21 13:52:50+02:00, hhunger@stripped +2 -2
    seventh set of fixed for bug#35988.

diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore	2008-04-10 18:32:33 +02:00
+++ b/BitKeeper/etc/ignore	2008-04-21 13:52:50 +02:00
@@ -3023,3 +3023,4 @@ win/vs8cache.txt
 ylwrap
 zlib/*.ds?
 zlib/*.vcproj
+libmysqld/.deps/item_create.Tpo
diff -Nrup a/mysql-test/r/query_cache_wlock_invalidate_func.result b/mysql-test/r/query_cache_wlock_invalidate_func.result
--- a/mysql-test/r/query_cache_wlock_invalidate_func.result	2008-04-10 15:13:39 +02:00
+++ b/mysql-test/r/query_cache_wlock_invalidate_func.result	2008-04-21 13:52:50 +02:00
@@ -54,7 +54,7 @@ LOCK TABLE t1 WRITE;
 SET @startTime = NOW();
 SELECT * FROM t1;
 SET @endTime = NOW();
-SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime));
+SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime)) >= 2;
 SELECT @TimeDifference;|
 ** Connection con0 **
 Sleeping 2 Seconds before unlock
@@ -66,7 +66,7 @@ id	value
 2	val2
 3	val3
 @TimeDifference
-2
+1
 Testing for value OFF
 ** Connection con0 **
 SET SESSION query_cache_wlock_invalidate = OFF;
diff -Nrup a/mysql-test/r/timestamp_func.result b/mysql-test/r/timestamp_func.result
--- a/mysql-test/r/timestamp_func.result	2008-04-10 15:13:45 +02:00
+++ b/mysql-test/r/timestamp_func.result	2008-04-21 13:52:50 +02:00
@@ -24,10 +24,10 @@ SET @ts_old = @@SESSION.timestamp;
 Changing time zone
 SET time_zone = 'MET';
 SET @ts_new = @@SESSION.timestamp;
-SELECT @ts_new - @ts_old AS 'Timestamp Difference';
+SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
 Timestamp Difference
 1
-1 Expected
+>=1 Expected
 ** Cleanup **
 ** Connection default **
 Disconnecting Connections con0, con1
diff -Nrup a/mysql-test/t/innodb_table_locks_func.test b/mysql-test/t/innodb_table_locks_func.test
--- a/mysql-test/t/innodb_table_locks_func.test	2008-04-10 15:13:57 +02:00
+++ b/mysql-test/t/innodb_table_locks_func.test	2008-04-21 13:52:50 +02:00
@@ -19,7 +19,9 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
 --source include/have_innodb.inc
+
 --echo '#--------------------FN_DYNVARS_048_01-------------------------#'
 ####################################################################
 # Check if setting innodb_table_locks is changed in new connection # 
diff -Nrup a/mysql-test/t/query_cache_wlock_invalidate_func.test b/mysql-test/t/query_cache_wlock_invalidate_func.test
--- a/mysql-test/t/query_cache_wlock_invalidate_func.test	2008-04-10 15:14:04 +02:00
+++ b/mysql-test/t/query_cache_wlock_invalidate_func.test	2008-04-21 13:52:50 +02:00
@@ -136,7 +136,7 @@ send
 SET @startTime = NOW();
 SELECT * FROM t1;
 SET @endTime = NOW();
-SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime));
+SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime)) >= 2;
 SELECT @TimeDifference;|
 
 delimiter ;|
diff -Nrup a/mysql-test/t/timestamp_func.test b/mysql-test/t/timestamp_func.test
--- a/mysql-test/t/timestamp_func.test	2008-04-10 15:14:11 +02:00
+++ b/mysql-test/t/timestamp_func.test	2008-04-21 13:52:50 +02:00
@@ -64,8 +64,8 @@ SET @ts_old = @@SESSION.timestamp;
 --echo Changing time zone
 SET time_zone = 'MET';
 SET @ts_new = @@SESSION.timestamp;
-SELECT @ts_new - @ts_old AS 'Timestamp Difference';
---echo 1 Expected
+SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
+--echo >=1 Expected
 
 #
 # Cleanup