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

cleanup: correct usage of semicolons in sql_yacc.yy

Browse Source
This commit is contained in:
Sergei Golubchik
2015-08-27 13:48:32 +02:00
parent c862c15bba
commit 704ba5c514
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_repl.cc
View File

@ -3022,8 +3022,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
}
else if (thd->lex->mi.relay_log_pos)
{
if (thd->lex->mi.pos)
slave_errno=ER_BAD_SLAVE_UNTIL_COND;
mi->rli.until_condition= Relay_log_info::UNTIL_RELAY_POS;
mi->rli.until_log_pos= thd->lex->mi.relay_log_pos;
strmake_buf(mi->rli.until_log_name, thd->lex->mi.relay_log_name);

11
sql/sql_yacc.yy
View File

@ -2350,6 +2350,7 @@ ignore_server_id:
{
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
}
;
do_domain_id_list:
/* Empty */
@ -2362,6 +2363,7 @@ do_domain_id:
{
insert_dynamic(&Lex->mi.repl_do_domain_ids, (uchar*) &($1));
}
;
ignore_domain_id_list:
/* Empty */
@ -2374,6 +2376,7 @@ ignore_domain_id:
{
insert_dynamic(&Lex->mi.repl_ignore_domain_ids, (uchar*) &($1));
}
;
master_file_def:
MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
@ -2382,7 +2385,6 @@ master_file_def:
}
| MASTER_LOG_POS_SYM EQ ulonglong_num
{
Lex->mi.pos = $3;
/*
If the user specified a value < BIN_LOG_HEADER_SIZE, adjust it
instead of causing subsequent errors.
@ -2394,7 +2396,7 @@ master_file_def:
from 0" (4 in fact), unspecified means "don't change the position
(keep the preceding value)").
*/
Lex->mi.pos= MY_MAX(BIN_LOG_HEADER_SIZE, Lex->mi.pos);
Lex->mi.pos= MY_MAX(BIN_LOG_HEADER_SIZE, $3);
}
| RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys
{
@ -2415,7 +2417,6 @@ master_file_def:
}
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_CURRENT_POS;
}
;
| MASTER_USE_GTID_SYM EQ SLAVE_POS_SYM
{
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
@ -2425,7 +2426,6 @@ master_file_def:
}
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_SLAVE_POS;
}
;
| MASTER_USE_GTID_SYM EQ NO_SYM
{
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
@ -2443,7 +2443,7 @@ optional_connection_name:
LEX *lex= thd->lex;
lex->mi.connection_name= null_lex_str;
}
| connection_name;
| connection_name
;
connection_name:
@ -2458,6 +2458,7 @@ connection_name:
}
#endif
}
;
/* create a table */