diff options
Diffstat (limited to 'mysql-test')
9 files changed, 30 insertions, 26 deletions
diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index 4aef4f5e48c..d0eb22ffcbc 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -26,7 +26,7 @@ WSREP_CLUSTER_ADDRESS gcomm:// WSREP_CLUSTER_NAME my_wsrep_cluster WSREP_CONVERT_LOCK_TO_TRX OFF WSREP_DBUG_OPTION -WSREP_DEBUG OFF +WSREP_DEBUG NONE WSREP_DESYNC OFF WSREP_DIRTY_READS OFF WSREP_DRUPAL_282555_WORKAROUND OFF diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup.cnf b/mysql-test/suite/galera/t/galera_sst_mariabackup.cnf index 336296e9bfe..be2ca0d1f09 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup.cnf +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup.cnf @@ -3,7 +3,7 @@ [mysqld] wsrep_sst_method=mariabackup wsrep_sst_auth="root:" -wsrep_debug=ON +wsrep_debug=1 [mysqld.1] wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_data_dir.cnf b/mysql-test/suite/galera/t/galera_sst_mariabackup_data_dir.cnf index aeb2301925e..b1caf700a12 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_data_dir.cnf +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_data_dir.cnf @@ -3,7 +3,7 @@ [mysqld] wsrep_sst_method=mariabackup wsrep_sst_auth="root:" -wsrep_debug=ON +wsrep_debug=1 [mysqld.1] wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.cnf b/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.cnf index 646d7322b41..60db7ddba77 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.cnf +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.cnf @@ -3,7 +3,7 @@ [mysqld] wsrep_sst_method=mariabackup wsrep_sst_auth="root:" -wsrep_debug=ON +wsrep_debug=1 [SST] tkey=@ENV.MYSQL_TEST_DIR/std_data/cakey.pem diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.cnf b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.cnf index 336296e9bfe..be2ca0d1f09 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.cnf +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.cnf @@ -3,7 +3,7 @@ [mysqld] wsrep_sst_method=mariabackup wsrep_sst_auth="root:" -wsrep_debug=ON +wsrep_debug=1 [mysqld.1] wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' diff --git a/mysql-test/suite/galera/t/galera_sst_mysqldump_with_key.cnf b/mysql-test/suite/galera/t/galera_sst_mysqldump_with_key.cnf index b7bca487fc5..ebd116a359f 100644 --- a/mysql-test/suite/galera/t/galera_sst_mysqldump_with_key.cnf +++ b/mysql-test/suite/galera/t/galera_sst_mysqldump_with_key.cnf @@ -14,7 +14,7 @@ wsrep_causal_reads=0 wsrep_sync_wait=0 [mysqld] -wsrep_debug=ON +wsrep_debug=1 [client] ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 49eaaa965dc..23a45f39896 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -115,18 +115,18 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME WSREP_DEBUG SESSION_VALUE NULL -GLOBAL_VALUE OFF +GLOBAL_VALUE NONE GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE NONE VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT To enable debug level logging +VARIABLE_TYPE ENUM +VARIABLE_COMMENT WSREP debug level logging NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON +ENUM_VALUE_LIST NONE,SERVER,TRANSACTION,STREAMING,CLIENT READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME WSREP_DESYNC SESSION_VALUE NULL GLOBAL_VALUE OFF diff --git a/mysql-test/suite/sys_vars/r/wsrep_debug_basic.result b/mysql-test/suite/sys_vars/r/wsrep_debug_basic.result index 96c262c110c..47d00f5dede 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_debug_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_debug_basic.result @@ -6,39 +6,41 @@ SET @wsrep_debug_global_saved = @@global.wsrep_debug; # default SELECT @@global.wsrep_debug; @@global.wsrep_debug -0 +NONE # scope SELECT @@session.wsrep_debug; ERROR HY000: Variable 'wsrep_debug' is a GLOBAL variable -SET @@global.wsrep_debug=OFF; +SET @@global.wsrep_debug=0; SELECT @@global.wsrep_debug; @@global.wsrep_debug -0 -SET @@global.wsrep_debug=ON; +NONE +SET @@global.wsrep_debug=1; SELECT @@global.wsrep_debug; @@global.wsrep_debug -1 +SERVER # valid values -SET @@global.wsrep_debug='OFF'; +SET @@global.wsrep_debug=NONE; SELECT @@global.wsrep_debug; @@global.wsrep_debug -0 -SET @@global.wsrep_debug=ON; +NONE +SET @@global.wsrep_debug=SERVER; SELECT @@global.wsrep_debug; @@global.wsrep_debug -1 +SERVER SET @@global.wsrep_debug=default; SELECT @@global.wsrep_debug; @@global.wsrep_debug -0 +NONE # invalid values SET @@global.wsrep_debug=NULL; ERROR 42000: Variable 'wsrep_debug' can't be set to the value of 'NULL' SET @@global.wsrep_debug='junk'; ERROR 42000: Variable 'wsrep_debug' can't be set to the value of 'junk' +SET @@global.wsrep_debug=ON; +ERROR 42000: Variable 'wsrep_debug' can't be set to the value of 'ON' # restore the initial value SET @@global.wsrep_debug = @wsrep_debug_global_saved; diff --git a/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test b/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test index 50576ff064e..165560bb25a 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test +++ b/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test @@ -14,16 +14,16 @@ SELECT @@global.wsrep_debug; --echo # scope --error ER_INCORRECT_GLOBAL_LOCAL_VAR SELECT @@session.wsrep_debug; -SET @@global.wsrep_debug=OFF; +SET @@global.wsrep_debug=0; SELECT @@global.wsrep_debug; -SET @@global.wsrep_debug=ON; +SET @@global.wsrep_debug=1; SELECT @@global.wsrep_debug; --echo --echo # valid values -SET @@global.wsrep_debug='OFF'; +SET @@global.wsrep_debug=NONE; SELECT @@global.wsrep_debug; -SET @@global.wsrep_debug=ON; +SET @@global.wsrep_debug=SERVER; SELECT @@global.wsrep_debug; SET @@global.wsrep_debug=default; SELECT @@global.wsrep_debug; @@ -34,6 +34,8 @@ SELECT @@global.wsrep_debug; SET @@global.wsrep_debug=NULL; --error ER_WRONG_VALUE_FOR_VAR SET @@global.wsrep_debug='junk'; +--error ER_WRONG_VALUE_FOR_VAR +SET @@global.wsrep_debug=ON; --echo --echo # restore the initial value |