diff options
| author | unknown <hhunger@hh-nb.hungers> | 2008-04-22 15:21:17 +0200 |
|---|---|---|
| committer | unknown <hhunger@hh-nb.hungers> | 2008-04-22 15:21:17 +0200 |
| commit | adf397e7086da18ee17725acd0dc6400453fd33f (patch) | |
| tree | dd57843d81d9de2faf3533b1a5af901e3439308d | |
| parent | 24e5579052074b95586c56a345897c68b4ab76f8 (diff) | |
| parent | d526b7523f1fc0122ad24cd8e9425035d02feb54 (diff) | |
| download | mariadb-git-adf397e7086da18ee17725acd0dc6400453fd33f.tar.gz | |
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build-repogca
BitKeeper/deleted/.del-query_cache_wlock_invalidate_func.result:
Delete: mysql-test/r/query_cache_wlock_invalidate_func.result
BitKeeper/deleted/.del-timestamp_func.result:
Delete: mysql-test/r/timestamp_func.result
BitKeeper/deleted/.del-innodb_table_locks_func.test:
Delete: mysql-test/t/innodb_table_locks_func.test
BitKeeper/deleted/.del-query_cache_wlock_invalidate_func.test:
Delete: mysql-test/t/query_cache_wlock_invalidate_func.test
BitKeeper/deleted/.del-timestamp_func.test:
Delete: mysql-test/t/timestamp_func.test
| -rw-r--r-- | mysql-test/r/query_cache_wlock_invalidate_func.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/timestamp_func.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/innodb_table_locks_func.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/query_cache_wlock_invalidate_func.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/timestamp_func.test | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/mysql-test/r/query_cache_wlock_invalidate_func.result b/mysql-test/r/query_cache_wlock_invalidate_func.result index ebaa29867bf..9278b6605ab 100644 --- a/mysql-test/r/query_cache_wlock_invalidate_func.result +++ b/mysql-test/r/query_cache_wlock_invalidate_func.result @@ -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 --git a/mysql-test/r/timestamp_func.result b/mysql-test/r/timestamp_func.result index 62837626ca2..c41db55cae6 100644 --- a/mysql-test/r/timestamp_func.result +++ b/mysql-test/r/timestamp_func.result @@ -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 --git a/mysql-test/t/innodb_table_locks_func.test b/mysql-test/t/innodb_table_locks_func.test index 79454c8e134..d233a2a5240 100644 --- a/mysql-test/t/innodb_table_locks_func.test +++ b/mysql-test/t/innodb_table_locks_func.test @@ -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 --git a/mysql-test/t/query_cache_wlock_invalidate_func.test b/mysql-test/t/query_cache_wlock_invalidate_func.test index a5b40422615..70b56f77da7 100644 --- a/mysql-test/t/query_cache_wlock_invalidate_func.test +++ b/mysql-test/t/query_cache_wlock_invalidate_func.test @@ -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 --git a/mysql-test/t/timestamp_func.test b/mysql-test/t/timestamp_func.test index d77c422cb7a..84c66441e6f 100644 --- a/mysql-test/t/timestamp_func.test +++ b/mysql-test/t/timestamp_func.test @@ -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 |