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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
dcab920a
Commit
dcab920a
authored
Sep 15, 2003
by
guilhem@gbichot2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Accept SLAVE START and STOP, even if deprecated.
parent
364bb41f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
sql/log_event.cc
sql/log_event.cc
+0
-6
sql/sql_yacc.yy
sql/sql_yacc.yy
+16
-2
No files found.
sql/log_event.cc
View file @
dcab920a
...
@@ -1084,12 +1084,6 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli)
...
@@ -1084,12 +1084,6 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli)
This is 4.x, so a Start_log_event is only at master startup,
This is 4.x, so a Start_log_event is only at master startup,
so we are sure the master has restarted and cleared his temp tables.
so we are sure the master has restarted and cleared his temp tables.
*/
*/
/*
If the master died before writing the COMMIT to the binlog, rollback;
otherwise it does not hurt to rollback.
*/
ha_rollback
(
thd
);
close_temporary_tables
(
thd
);
close_temporary_tables
(
thd
);
cleanup_load_tmpdir
();
cleanup_load_tmpdir
();
break
;
break
;
...
...
sql/sql_yacc.yy
View file @
dcab920a
...
@@ -1751,7 +1751,8 @@ opt_to:
...
@@ -1751,7 +1751,8 @@ opt_to:
| AS {};
| AS {};
/*
/*
The first two deprecate the last two--delete the last two for 4.1 release
SLAVE START and SLAVE STOP are deprecated. We keep them for compatibility.
To use UNTIL, one must use START SLAVE, not SLAVE START.
*/
*/
slave:
slave:
...
@@ -1771,7 +1772,20 @@ slave:
...
@@ -1771,7 +1772,20 @@ slave:
lex->sql_command = SQLCOM_SLAVE_STOP;
lex->sql_command = SQLCOM_SLAVE_STOP;
lex->type = 0;
lex->type = 0;
}
}
;
| SLAVE START_SYM slave_thread_opts
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START;
lex->type = 0;
}
| SLAVE STOP_SYM slave_thread_opts
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP;
lex->type = 0;
}
;
start:
start:
START_SYM TRANSACTION_SYM { Lex->sql_command = SQLCOM_BEGIN;}
START_SYM TRANSACTION_SYM { Lex->sql_command = SQLCOM_BEGIN;}
...
...
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