diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-01 13:15:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-01 13:15:38 -0400 |
| commit | 23fed784048624cb147efdc0e54287c13cdcf12c (patch) | |
| tree | 51c07d2141675bb74fcbf71c2448ba5ab1a45af3 | |
| parent | d6d40112110e05f62122e90f209f05f273c7e6dc (diff) | |
| download | mariadb-git-23fed784048624cb147efdc0e54287c13cdcf12c.tar.gz | |
MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno (postfix)
- Fix build failure when built without wsrep (Win)
- Update the expected warning in sys_vars.wsrep_start_position
| -rw-r--r-- | mysql-test/suite/sys_vars/r/wsrep_start_position_basic.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/wsrep_start_position_basic.test | 2 | ||||
| -rw-r--r-- | sql/wsrep_sst.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/sys_vars/r/wsrep_start_position_basic.result b/mysql-test/suite/sys_vars/r/wsrep_start_position_basic.result index 036debb55ba..fd6dc1b5a4d 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_start_position_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_start_position_basic.result @@ -27,7 +27,7 @@ SELECT @@global.wsrep_start_position; 00000000-0000-0000-0000-000000000000:-1 # invalid values -call mtr.add_suppression("WSREP: SST postion can't be set in past.*"); +call mtr.add_suppression("WSREP: SST position can't be set in past. Requested: -2, Current: -1."); SET @@global.wsrep_start_position='00000000-0000-0000-0000-000000000000:-2'; ERROR 42000: Variable 'wsrep_start_position' can't be set to the value of '00000000-0000-0000-0000-000000000000:-2' SELECT @@global.wsrep_start_position; diff --git a/mysql-test/suite/sys_vars/t/wsrep_start_position_basic.test b/mysql-test/suite/sys_vars/t/wsrep_start_position_basic.test index 936646f6f85..7f8eb138727 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_start_position_basic.test +++ b/mysql-test/suite/sys_vars/t/wsrep_start_position_basic.test @@ -26,7 +26,7 @@ SELECT @@global.wsrep_start_position; --echo --echo # invalid values -call mtr.add_suppression("WSREP: SST postion can't be set in past.*"); +call mtr.add_suppression("WSREP: SST position can't be set in past. Requested: -2, Current: -1."); --error ER_WRONG_VALUE_FOR_VAR SET @@global.wsrep_start_position='00000000-0000-0000-0000-000000000000:-2'; SELECT @@global.wsrep_start_position; diff --git a/sql/wsrep_sst.h b/sql/wsrep_sst.h index d465f897985..512da060599 100644 --- a/sql/wsrep_sst.h +++ b/sql/wsrep_sst.h @@ -75,7 +75,7 @@ extern void wsrep_SE_initialized(); /*! mark SE initialization complete */ #define wsrep_SE_initialized() do { } while(0) #define wsrep_SE_init_grab() do { } while(0) #define wsrep_SE_init_done() do { } while(0) -#define wsrep_sst_continue() do { } while(0) +#define wsrep_sst_continue() (0) #endif /* WITH_WSREP */ #endif /* WSREP_SST_H */ |