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/r/ssl_key_basic.result | |
| 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/r/ssl_key_basic.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/ssl_key_basic.result | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/ssl_key_basic.result b/mysql-test/suite/sys_vars/r/ssl_key_basic.result new file mode 100644 index 00000000000..0869a2915e3 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/ssl_key_basic.result @@ -0,0 +1,53 @@ +'#---------------------BS_STVARS_049_01----------------------#' +SELECT COUNT(@@GLOBAL.ssl_key); +COUNT(@@GLOBAL.ssl_key) +1 +1 Expected +'#---------------------BS_STVARS_049_02----------------------#' +SET @@GLOBAL.ssl_key=1; +ERROR HY000: Variable 'ssl_key' is a read only variable +Expected error 'Read only variable' +SELECT COUNT(@@GLOBAL.ssl_key); +COUNT(@@GLOBAL.ssl_key) +1 +1 Expected +'#---------------------BS_STVARS_049_03----------------------#' +SELECT @@GLOBAL.ssl_key = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='ssl_key'; +@@GLOBAL.ssl_key = VARIABLE_VALUE +1 +1 Expected +SELECT COUNT(@@GLOBAL.ssl_key); +COUNT(@@GLOBAL.ssl_key) +1 +1 Expected +SELECT COUNT(VARIABLE_VALUE) +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='ssl_key'; +COUNT(VARIABLE_VALUE) +1 +1 Expected +'#---------------------BS_STVARS_049_04----------------------#' +SELECT @@ssl_key = @@GLOBAL.ssl_key; +@@ssl_key = @@GLOBAL.ssl_key +1 +1 Expected +'#---------------------BS_STVARS_049_05----------------------#' +SELECT COUNT(@@ssl_key); +COUNT(@@ssl_key) +1 +1 Expected +SELECT COUNT(@@local.ssl_key); +ERROR HY000: Variable 'ssl_key' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT COUNT(@@SESSION.ssl_key); +ERROR HY000: Variable 'ssl_key' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT COUNT(@@GLOBAL.ssl_key); +COUNT(@@GLOBAL.ssl_key) +1 +1 Expected +SELECT ssl_key = @@SESSION.ssl_key; +ERROR 42S22: Unknown column 'ssl_key' in 'field list' +Expected error 'Readonly variable' |