Skip to content

Commit 47a64a8

Browse files
author
Sven Sandberg
committed
Renames as decided by team:
 UGID -> GTID LGID -> LTID super-group -> commit-sequence dummy group -> empty group Group_set -> GTID_set Report error properly in group.cc Unlock sid_lock after enter_cond in zgroup_execution/zmutex_cond
1 parent 1a67ab0 commit 47a64a8

173 files changed

Lines changed: 10786 additions & 10790 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/client_priv.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ enum options_client
9292
OPT_BINARY_MODE,
9393
OPT_SSL_CRL, OPT_SSL_CRLPATH,
9494
OPT_MAX_CLIENT_OPTION,
95-
OPT_MYSQLBINLOG_SKIP_UGIDS,
96-
OPT_MYSQLBINLOG_INCLUDE_UGIDS,
97-
OPT_MYSQLBINLOG_EXCLUDE_UGIDS,
98-
OPT_MYSQLBINLOG_FIRST_LGID,
99-
OPT_MYSQLBINLOG_LAST_LGID
95+
OPT_MYSQLBINLOG_SKIP_GTIDS,
96+
OPT_MYSQLBINLOG_INCLUDE_GTIDS,
97+
OPT_MYSQLBINLOG_EXCLUDE_GTIDS,
98+
OPT_MYSQLBINLOG_FIRST_LTID,
99+
OPT_MYSQLBINLOG_LAST_LTID
100100
};
101101

102102
/**

‎client/mysqlbinlog.cc‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ enum Exit_status {
144144
OK_STOP
145145
};
146146

147-
#ifdef HAVE_UGID
148-
static char *opt_include_ugids_str, *opt_exclude_ugids_str;
149-
static char *opt_first_lgid_str= NULL, *opt_last_lgid_str= NULL;
150-
static my_bool opt_skip_ugids= 0;
147+
#ifdef HAVE_GTID
148+
static char *opt_include_gtids_str, *opt_exclude_gtids_str;
149+
static char *opt_first_ltid_str= NULL, *opt_last_ltid_str= NULL;
150+
static my_bool opt_skip_gtids= 0;
151151
#endif
152152

153153
static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
@@ -1201,27 +1201,27 @@ static struct my_option my_long_options[] =
12011201
/* def_value 4GB */ UINT_MAX, /* min_value */ 256,
12021202
/* max_value */ ULONG_MAX, /* sub_size */ 0,
12031203
/* block_size */ 256, /* app_type */ 0},
1204-
#ifdef HAVE_UGID
1205-
{"skip-ugids", OPT_MYSQLBINLOG_SKIP_UGIDS,
1206-
"Do not print universal group identifier information "
1207-
"(SET UGID_NEXT=... etc).",
1208-
&opt_skip_ugids, &opt_skip_ugids, 0,
1204+
#ifdef HAVE_GTID
1205+
{"skip-gtids", OPT_MYSQLBINLOG_SKIP_GTIDS,
1206+
"Do not print Global Transaction Identifier information "
1207+
"(SET GTID_NEXT=... etc).",
1208+
&opt_skip_gtids, &opt_skip_gtids, 0,
12091209
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
1210-
{"include-ugids", OPT_MYSQLBINLOG_INCLUDE_UGIDS,
1211-
"Include only the given universal group identifiers.",
1212-
&opt_include_ugids_str, &opt_include_ugids_str, 0,
1210+
{"include-gtids", OPT_MYSQLBINLOG_INCLUDE_GTIDS,
1211+
"Include only the given Global Transaction Identifiers.",
1212+
&opt_include_gtids_str, &opt_include_gtids_str, 0,
12131213
GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1214-
{"exclude-ugids", OPT_MYSQLBINLOG_EXCLUDE_UGIDS,
1215-
"Print all but the given universal group identifiers.",
1216-
&opt_exclude_ugids_str, &opt_exclude_ugids_str, 0,
1214+
{"exclude-gtids", OPT_MYSQLBINLOG_EXCLUDE_GTIDS,
1215+
"Print all but the given Global Transaction Identifiers.",
1216+
&opt_exclude_gtids_str, &opt_exclude_gtids_str, 0,
12171217
GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1218-
{"first-lgid", OPT_MYSQLBINLOG_FIRST_LGID,
1219-
"Ignore groups before the given Local Group ID.",
1220-
&opt_first_lgid_str, &opt_first_lgid_str, 0,
1218+
{"first-ltid", OPT_MYSQLBINLOG_FIRST_LTID,
1219+
"Ignore groups before the given Local Transaction Identifier.",
1220+
&opt_first_ltid_str, &opt_first_ltid_str, 0,
12211221
GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1222-
{"last-lgid", OPT_MYSQLBINLOG_LAST_LGID,
1223-
"Ignore groups after the given Local Group ID.",
1224-
&opt_last_lgid_str, &opt_last_lgid_str, 0,
1222+
{"last-ltid", OPT_MYSQLBINLOG_LAST_LTID,
1223+
"Ignore groups after the given Local Transaction Identifier.",
1224+
&opt_last_ltid_str, &opt_last_ltid_str, 0,
12251225
GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
12261226
#endif
12271227
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
@@ -2362,5 +2362,5 @@ int main(int argc, char** argv)
23622362
#include "zreturn.cc"
23632363
#include "zsubgroup_coder.cc"
23642364
#include "zuuid.cc"
2365-
#include "zgroup_set.cc"
2365+
#include "zgtid_set.cc"
23662366
#include "zgroup.cc"

‎libmysqld/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ SET(SQL_EMBEDDED_SOURCES
7272
../sql/zsubgroup_coder.cc
7373
../sql/zowner_id.cc
7474
../sql/zsid_map.cc
75-
../sql/zgroup_set.cc
76-
../sql/zugid_specification.cc
75+
../sql/zgtid_set.cc
76+
../sql/zgtid_specification.cc
7777
../sql/zgroup_log_state.cc
7878
../sql/zowned_groups.cc
7979
../sql/zgroup_cache.cc

‎mysql-test/extra/binlog_tests/binlog.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ BINLOG '
305305

306306
# Show binlog events to check that server ids are correct.
307307
--replace_column 1 # 2 # 5 #
308-
--replace_regex /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ /table_id: [0-9]+/table_id: #/ /SET @@SESSION.UGID_NEXT=.*$/SET @@SESSION.UGID_NEXT= 'UGID';/ /GROUPS: .*:(.*,.*)/GROUPS: UGID:(X,X)/
308+
--replace_regex /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ /table_id: [0-9]+/table_id: #/ /SET @@SESSION.GTID_NEXT=.*$/SET @@SESSION.GTID_NEXT= 'GTID';/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/
309309
SHOW BINLOG EVENTS;
310310

311311
DROP TABLE t1;

‎mysql-test/extra/binlog_tests/ctype_ucs_binlog.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source include/show_binlog_events.inc;
1717
flush logs;
1818
let $MYSQLD_DATADIR= `select @@datadir`;
1919
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
20-
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/ /SET @@SESSION.UGID_NEXT= .*;/SET @@SESSION.UGID_NEXT= 'UGID';/ /GROUPS: .*:(.*,.*) /GROUPS: UGID:(X,X)/
20+
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/ /SET @@SESSION.GTID_NEXT= .*;/SET @@SESSION.GTID_NEXT= 'GTID';/ /GROUPS: .*:(.*,.*) /GROUPS: GTID:(X,X)/
2121
--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001
2222
drop table t2;
2323

‎mysql-test/extra/rpl_tests/create_recursive_construct.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ if ($CRC_RET_stmt_sidef) {
346346
--die Warnings printed
347347
}
348348
--let $event_type= query_get_value(SHOW BINLOG EVENTS, Event_type, 5)
349-
# The first event is format_description, the second is Ugid_event,
349+
# The first event is format_description, the second is Gtid_event,
350350
# the third Query_event('BEGIN'), and the fourth should be our Query
351351
# for 'INSERT DELAYED' unsafe_type 3, which is safe after
352352
# the fix of bug#54579.
@@ -356,7 +356,7 @@ if ($CRC_RET_stmt_sidef) {
356356
SHOW BINLOG EVENTS;
357357
--die Wrong events in binlog.
358358
}
359-
# The first event is format_description, the second is Ugid_event,
359+
# The first event is format_description, the second is Gtid_event,
360360
# the third is Query_event('BEGIN'), and the fourth should be our Table_map
361361
# for unsafe statement.
362362
if (`SELECT $unsafe_type != 3 AND '$event_type' != 'Table_map'`) {

‎mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ while ($ddl_cases >= 1)
4242
# In SBR and MIXED modes, the commit event is usually the fourth event in the
4343
# binary log:
4444
#
45-
# 1: UGID
45+
# 1: GTID
4646
# 2: BEGIN
4747
# 3: INSERT
4848
# 4: COMMIT
49-
# 5: UGID
49+
# 5: GTID
5050
# 6: DDL EVENT which triggered the previous commmit.
5151
#
5252
if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
@@ -56,12 +56,12 @@ while ($ddl_cases >= 1)
5656
#
5757
# In RBR mode, the commit event is usually the fifth event in the binary log:
5858
#
59-
# 1: UGID
59+
# 1: GTID
6060
# 2: BEGIN
6161
# 3: TABLE MAP EVENT
6262
# 4: ROW EVENT
6363
# 5: COMMIT
64-
# 6: UGID
64+
# 6: GTID
6565
# 7: DDL EVENT which triggered the previous commmit.
6666
#
6767
if (`select @@binlog_format = 'ROW'`)
@@ -269,13 +269,13 @@ while ($ddl_cases >= 1)
269269
#
270270
# In RBR mode, due to the trigger the tt_2 is also updated:
271271
#
272-
# 1: UGID
272+
# 1: GTID
273273
# 2: BEGIN
274274
# 3: TABLE MAP EVENT
275275
# 4: TABLE MAP EVENT
276276
# 5: ROW EVENT
277277
# 6: COMMIT
278-
# 7: UGID
278+
# 7: GTID
279279
# 8: DDL EVENT which triggered the previous commmit.
280280
#
281281
if (`select @@binlog_format = 'ROW' && '$engine' != 'NDB'`)
@@ -366,7 +366,7 @@ while ($ddl_cases >= 1)
366366
# In SBR and MIXED modes, the DDL statement is written to the binary log but
367367
# does not commit the current transaction.
368368
#
369-
# 1: UGID
369+
# 1: GTID
370370
# 2: BEGIN
371371
# 3: CREATE TEMPORARY
372372
# 4: INSERT
@@ -375,7 +375,7 @@ while ($ddl_cases >= 1)
375375
# In RBR the transaction is not committed either and the statement is not
376376
# written to the binary log:
377377
#
378-
# 1: UGID
378+
# 1: GTID
379379
# 2: BEGIN
380380
# 3: TABLE MAP EVENT
381381
# 4: ROW EVENT
@@ -425,12 +425,12 @@ while ($ddl_cases >= 1)
425425
#
426426
# In MIXED mode, the changes are logged as rows and we have what follows:
427427
#
428-
# 1: UGID
428+
# 1: GTID
429429
# 2: BEGIN
430430
# 3: TABLE MAP EVENT
431431
# 4: ROW EVENT
432432
# 5: COMMIT
433-
# 6: UGID
433+
# 6: GTID
434434
# 7: DDL EVENT which triggered the previous commmit.
435435
#
436436
if (`select @@binlog_format = 'MIXED'`)
@@ -459,12 +459,12 @@ while ($ddl_cases >= 1)
459459
#
460460
# In MIXED mode, the changes are logged as rows and we have what follows:
461461
#
462-
# 1: UGID
462+
# 1: GTID
463463
# 2: BEGIN
464464
# 3: TABLE MAP EVENT
465465
# 4: ROW EVENT
466466
# 5: COMMIT
467-
# 6: UGID
467+
# 6: GTID
468468
# 7: DDL EVENT which triggered the previous commmit.
469469
#
470470
if (`select @@binlog_format = 'MIXED'`)
@@ -497,7 +497,7 @@ while ($ddl_cases >= 1)
497497
#
498498
# In SBR, we have what follows:
499499
#
500-
# 1: UGID
500+
# 1: GTID
501501
# 2: BEGIN
502502
# 3: INSERT
503503
# 4: DROP TEMPORARY
@@ -506,7 +506,7 @@ while ($ddl_cases >= 1)
506506
# In RBR the transaction is not committed either and the statement is not
507507
# written to the binary log:
508508
#
509-
# 1: UGID
509+
# 1: GTID
510510
# 2: BEGIN
511511
# 3: TABLE MAP EVENT
512512
# 4: ROW EVENT
@@ -518,7 +518,7 @@ while ($ddl_cases >= 1)
518518
}
519519
# In MIXED mode, the changes are logged as rows and we have what follows:
520520
#
521-
# 1: UGID
521+
# 1: GTID
522522
# 2: BEGIN
523523
# 3: TABLE MAP EVENT
524524
# 4: ROW EVENT

‎mysql-test/include/have_archive_plugin.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ if (`select plugin_library IS NULL from information_schema.plugins where plugin_
77
if (`SELECT @@plugin_dir != '$ARCHIVE_PLUGIN_DIR'`) {
88
--skip Archive plugin requires that --plugin-dir is set to the archive plugin dir (either the .opt file does not contain \$ARCHIVE_PLUGIN_OPT or another plugin is in use)
99
}
10-
enable_query_log;
10+
enable_query_log;

‎mysql-test/include/have_ugid.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# ==== Purpose ====
22
#
3-
# Ensure that the server is running with UGID support compiled in.
3+
# Ensure that the server is running with GTID support compiled in.
44
#
55
# ==== Usage ====
66
#
7-
# --source include/have_ugid.inc
7+
# --source include/have_gtid.inc
88

9-
if (`SELECT COUNT(*) = 0 OR VARIABLE_VALUE != 'YES' FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'HAVE_UGID'`)
9+
if (`SELECT COUNT(*) = 0 OR VARIABLE_VALUE != 'YES' FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'HAVE_GTID'`)
1010
{
11-
--skip Test requires UGID.
11+
--skip Test requires GTID.
1212
}

‎mysql-test/include/mtr_check.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ BEGIN
6161
-- Dump all global variables except those that may change.
6262
-- timestamp changes if time passes. server_uuid changes if server restarts.
6363
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
64-
WHERE variable_name NOT IN ('timestamp', 'server_uuid', 'ugid_ended_groups',
65-
'ugid_partial_groups', 'innodb_file_format_max')
64+
WHERE variable_name NOT IN ('timestamp', 'server_uuid', 'gtid_ended_groups',
65+
'gtid_partial_groups', 'innodb_file_format_max')
6666
ORDER BY VARIABLE_NAME;
6767

6868
-- Dump all databases, there should be none

0 commit comments

Comments
 (0)