Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
704ba5c5
Commit
704ba5c5
authored
Aug 27, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: correct usage of semicolons in sql_yacc.yy
parent
c862c15b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
sql/sql_repl.cc
sql/sql_repl.cc
+0
-2
sql/sql_yacc.yy
sql/sql_yacc.yy
+6
-5
No files found.
sql/sql_repl.cc
View file @
704ba5c5
...
@@ -3022,8 +3022,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
...
@@ -3022,8 +3022,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
}
}
else
if
(
thd
->
lex
->
mi
.
relay_log_pos
)
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_condition
=
Relay_log_info
::
UNTIL_RELAY_POS
;
mi
->
rli
.
until_log_pos
=
thd
->
lex
->
mi
.
relay_log_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
);
strmake_buf
(
mi
->
rli
.
until_log_name
,
thd
->
lex
->
mi
.
relay_log_name
);
...
...
sql/sql_yacc.yy
View file @
704ba5c5
...
@@ -2350,6 +2350,7 @@ ignore_server_id:
...
@@ -2350,6 +2350,7 @@ ignore_server_id:
{
{
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
}
}
;
do_domain_id_list:
do_domain_id_list:
/* Empty */
/* Empty */
...
@@ -2362,6 +2363,7 @@ do_domain_id:
...
@@ -2362,6 +2363,7 @@ do_domain_id:
{
{
insert_dynamic(&Lex->mi.repl_do_domain_ids, (uchar*) &($1));
insert_dynamic(&Lex->mi.repl_do_domain_ids, (uchar*) &($1));
}
}
;
ignore_domain_id_list:
ignore_domain_id_list:
/* Empty */
/* Empty */
...
@@ -2374,6 +2376,7 @@ ignore_domain_id:
...
@@ -2374,6 +2376,7 @@ ignore_domain_id:
{
{
insert_dynamic(&Lex->mi.repl_ignore_domain_ids, (uchar*) &($1));
insert_dynamic(&Lex->mi.repl_ignore_domain_ids, (uchar*) &($1));
}
}
;
master_file_def:
master_file_def:
MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
...
@@ -2382,7 +2385,6 @@ master_file_def:
...
@@ -2382,7 +2385,6 @@ master_file_def:
}
}
| MASTER_LOG_POS_SYM EQ ulonglong_num
| MASTER_LOG_POS_SYM EQ ulonglong_num
{
{
Lex->mi.pos = $3;
/*
/*
If the user specified a value < BIN_LOG_HEADER_SIZE, adjust it
If the user specified a value < BIN_LOG_HEADER_SIZE, adjust it
instead of causing subsequent errors.
instead of causing subsequent errors.
...
@@ -2394,7 +2396,7 @@ master_file_def:
...
@@ -2394,7 +2396,7 @@ master_file_def:
from 0" (4 in fact), unspecified means "don't change the position
from 0" (4 in fact), unspecified means "don't change the position
(keep the preceding value)").
(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
| RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys
{
{
...
@@ -2415,7 +2417,6 @@ master_file_def:
...
@@ -2415,7 +2417,6 @@ master_file_def:
}
}
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_CURRENT_POS;
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_CURRENT_POS;
}
}
;
| MASTER_USE_GTID_SYM EQ SLAVE_POS_SYM
| MASTER_USE_GTID_SYM EQ SLAVE_POS_SYM
{
{
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
...
@@ -2425,7 +2426,6 @@ master_file_def:
...
@@ -2425,7 +2426,6 @@ master_file_def:
}
}
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_SLAVE_POS;
Lex->mi.use_gtid_opt= LEX_MASTER_INFO::LEX_GTID_SLAVE_POS;
}
}
;
| MASTER_USE_GTID_SYM EQ NO_SYM
| MASTER_USE_GTID_SYM EQ NO_SYM
{
{
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
if (Lex->mi.use_gtid_opt != LEX_MASTER_INFO::LEX_GTID_UNCHANGED)
...
@@ -2443,7 +2443,7 @@ optional_connection_name:
...
@@ -2443,7 +2443,7 @@ optional_connection_name:
LEX *lex= thd->lex;
LEX *lex= thd->lex;
lex->mi.connection_name= null_lex_str;
lex->mi.connection_name= null_lex_str;
}
}
| connection_name
;
| connection_name
;
;
connection_name:
connection_name:
...
@@ -2458,6 +2458,7 @@ connection_name:
...
@@ -2458,6 +2458,7 @@ connection_name:
}
}
#endif
#endif
}
}
;
/* create a table */
/* create a table */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment