database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno (postfix)

Browse Source 
- Fix build failure when built without wsrep (Win)
- Update the expected warning in sys_vars.wsrep_start_position
This commit is contained in:
Nirbhay Choubey
2016-06-01 13:15:38 -04:00
parent d6d4011211
commit 23fed78404
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/sys_vars/r/wsrep_start_position_basic.result
View File

@ -27,7 +27,7 @@ SELECT @@global.wsrep_start_position;
00000000-0000-0000-0000-000000000000:-1 00000000-0000-0000-0000-000000000000:-1
# invalid values # 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'; 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' 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; SELECT @@global.wsrep_start_position;

2
mysql-test/suite/sys_vars/t/wsrep_start_position_basic.test
View File

@ -26,7 +26,7 @@ SELECT @@global.wsrep_start_position;
--echo --echo
--echo # invalid values --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 --error ER_WRONG_VALUE_FOR_VAR
SET @@global.wsrep_start_position='00000000-0000-0000-0000-000000000000:-2'; SET @@global.wsrep_start_position='00000000-0000-0000-0000-000000000000:-2';
SELECT @@global.wsrep_start_position; SELECT @@global.wsrep_start_position;

2
sql/wsrep_sst.h
View File

@ -75,7 +75,7 @@ extern void wsrep_SE_initialized(); /*! mark SE initialization complete */
#define wsrep_SE_initialized() do { } while(0) #define wsrep_SE_initialized() do { } while(0)
#define wsrep_SE_init_grab() do { } while(0) #define wsrep_SE_init_grab() do { } while(0)
#define wsrep_SE_init_done() 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 /* WITH_WSREP */
#endif /* WSREP_SST_H */ #endif /* WSREP_SST_H */