Commit 23fed784 authored by Nirbhay Choubey's avatar Nirbhay Choubey

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
parent d6d40112
......@@ -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;
......
......@@ -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;
......
......@@ -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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment