mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
MDEV-26: Global transaction ID.
Replace CHANGE MASTER TO ... master_gtid_pos='xxx' with a new system variable @@global.gtid_pos. This is more logical; @@gtid_pos is global, not per-master, and it is not affected by RESET SLAVE. Also rename master_gtid_pos=AUTO to master_use_gtid=1, which again is more logical.
This commit is contained in:
@ -290,8 +290,6 @@ struct LEX_MASTER_INFO
|
||||
char *relay_log_name;
|
||||
LEX_STRING connection_name;
|
||||
ulonglong pos;
|
||||
LEX_STRING gtid_pos_str;
|
||||
bool gtid_pos_auto;
|
||||
ulong relay_log_pos;
|
||||
ulong server_id;
|
||||
uint port, connect_retry;
|
||||
@ -301,7 +299,8 @@ struct LEX_MASTER_INFO
|
||||
changed variable or if it should be left at old value
|
||||
*/
|
||||
enum {LEX_MI_UNCHANGED, LEX_MI_DISABLE, LEX_MI_ENABLE}
|
||||
ssl, ssl_verify_server_cert, heartbeat_opt, repl_ignore_server_ids_opt;
|
||||
ssl, ssl_verify_server_cert, heartbeat_opt, repl_ignore_server_ids_opt,
|
||||
use_gtid_opt;
|
||||
|
||||
void init()
|
||||
{
|
||||
@ -315,12 +314,9 @@ struct LEX_MASTER_INFO
|
||||
host= user= password= log_file_name= ssl_key= ssl_cert= ssl_ca=
|
||||
ssl_capath= ssl_cipher= relay_log_name= 0;
|
||||
pos= relay_log_pos= server_id= port= connect_retry= 0;
|
||||
gtid_pos_str.str= NULL;
|
||||
gtid_pos_str.length= 0;
|
||||
gtid_pos_auto= FALSE;
|
||||
heartbeat_period= 0;
|
||||
ssl= ssl_verify_server_cert= heartbeat_opt=
|
||||
repl_ignore_server_ids_opt= LEX_MI_UNCHANGED;
|
||||
repl_ignore_server_ids_opt= use_gtid_opt= LEX_MI_UNCHANGED;
|
||||
}
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user