Skip to content

Commit 704ba5c

Browse files
committed
cleanup: correct usage of semicolons in sql_yacc.yy
1 parent c862c15 commit 704ba5c

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

sql/sql_repl.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3022,8 +3022,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
30223022
}
30233023
else if (thd->lex->mi.relay_log_pos)
30243024
{
3025-
if (thd->lex->mi.pos)
3026-
slave_errno=ER_BAD_SLAVE_UNTIL_COND;
30273025
mi->rli.until_condition= Relay_log_info::UNTIL_RELAY_POS;
30283026
mi->rli.until_log_pos= thd->lex->mi.relay_log_pos;
30293027
strmake_buf(mi->rli.until_log_name, thd->lex->mi.relay_log_name);

sql/sql_yacc.yy

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,6 +2350,7 @@ ignore_server_id:
23502350
{
23512351
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
23522352
}
2353+
;
23532354

23542355
do_domain_id_list:
23552356
/* Empty */
@@ -2362,6 +2363,7 @@ do_domain_id:
23622363
{
23632364
insert_dynamic(&Lex->mi.repl_do_domain_ids, (uchar*) &($1));
23642365
}
2366+
;
23652367

23662368
ignore_domain_id_list:
23672369
/* Empty */
@@ -2374,6 +2376,7 @@ ignore_domain_id:
23742376
{
23752377
insert_dynamic(&Lex->mi.repl_ignore_domain_ids, (uchar*) &($1));
23762378
}
2379+
;
23772380

23782381
master_file_def:
23792382
MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
@@ -2382,7 +2385,6 @@ master_file_def:
23822385
}
23832386
| MASTER_LOG_POS_SYM EQ ulonglong_num
23842387
{
2385-
Lex->mi.pos = $3;
23862388
/*
23872389
If the user specified a value < BIN_LOG_HEADER_SIZE, adjust it
23882390
instead of causing subsequent errors.
@@ -2394,7 +2396,7 @@ master_file_def:
23942396
from 0" (4 in fact), unspecified means "don't change the position
23952397
(keep the preceding value)").
23962398
*/
2397-
Lex->mi.pos= MY_MAX(BIN_LOG_HEADER_SIZE, Lex->mi.pos);
2399+
Lex->mi.pos= MY_MAX(BIN_LOG_HEADER_SIZE, $3);
23982400
}
23992401
| RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys
24002402
{
@@ -2415,7 +2417,6 @@ master_file_def:
24152417
}
24162418
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_CURRENT_POS;
24172419
}
2418-
;
24192420
| MASTER_USE_GTID_SYM EQ SLAVE_POS_SYM
24202421
{
24212422
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
@@ -2425,7 +2426,6 @@ master_file_def:
24252426
}
24262427
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_SLAVE_POS;
24272428
}
2428-
;
24292429
| MASTER_USE_GTID_SYM EQ NO_SYM
24302430
{
24312431
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
@@ -2443,7 +2443,7 @@ optional_connection_name:
24432443
LEX *lex= thd->lex;
24442444
lex->mi.connection_name= null_lex_str;
24452445
}
2446-
| connection_name;
2446+
| connection_name
24472447
;
24482448

24492449
connection_name:
@@ -2458,6 +2458,7 @@ connection_name:
24582458
}
24592459
#endif
24602460
}
2461+
;
24612462

24622463
/* create a table */
24632464

0 commit comments

Comments
 (0)