diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
| commit | 704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /mysql-test/suite/sys_vars/inc/timestamp_basic.inc | |
| parent | 2637dda66845868fe996e60e54996acf03f6c537 (diff) | |
| parent | a5e5b0180a6b86cce258eef232ef59d6e7c40bb0 (diff) | |
| download | mariadb-git-704b4845aa9ce51a6c5a9f5f42265e376db0dfb3.tar.gz | |
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to 'mysql-test/suite/sys_vars/inc/timestamp_basic.inc')
| -rw-r--r-- | mysql-test/suite/sys_vars/inc/timestamp_basic.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc index d7ad620ec26..9ef57c97043 100644 --- a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc +++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc @@ -18,8 +18,8 @@ # * Scope & Access method # # * Data Integrity # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### @@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999; # Check if the value in SESSION Table matches value in variable # ######################################################################### -SELECT @@timestamp = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='timestamp'; +# disabled due to bug#41584 +#SELECT @@timestamp = VARIABLE_VALUE +#FROM INFORMATION_SCHEMA.SESSION_VARIABLES +#WHERE VARIABLE_NAME='timestamp'; --echo '#---------------------FN_DYNVARS_001_08-------------------------#' ############################################################################# |