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
c36c37c3
Commit
c36c37c3
authored
Jul 14, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
merge
mysql-test/r/rpl_max_relay_size.result: Auto merged
parents
45db29db
e97b2766
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
mysql-test/t/rpl_max_relay_size.test
mysql-test/t/rpl_max_relay_size.test
+6
-6
sql/log.cc
sql/log.cc
+2
-2
No files found.
mysql-test/t/rpl_max_relay_size.test
View file @
c36c37c3
...
...
@@ -28,7 +28,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096
select
@@
global
.
max_relay_log_size
;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
3306
MASTER_PORT
3334
MASTER_PORT
show
slave
status
;
stop
slave
;
reset
slave
;
...
...
@@ -36,7 +36,7 @@ set global max_relay_log_size=(5*4096);
select
@@
global
.
max_relay_log_size
;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
3306
MASTER_PORT
3334
MASTER_PORT
show
slave
status
;
stop
slave
;
reset
slave
;
...
...
@@ -44,7 +44,7 @@ set global max_relay_log_size=0;
select
@@
global
.
max_relay_log_size
;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
3306
MASTER_PORT
3334
MASTER_PORT
show
slave
status
;
# Tests below are mainly to ensure that we have not coded with wrong assumptions
...
...
@@ -54,7 +54,7 @@ reset slave;
# test of relay log rotation when the slave is stopped
# (to make sure it does not crash).
flush
logs
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
3306
MASTER_PORT
3334
MASTER_PORT
show
slave
status
;
reset
slave
;
...
...
@@ -69,7 +69,7 @@ create table t1 (a int);
save_master_pos
;
connection
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
3306
MASTER_PORT
3334
MASTER_PORT
show
slave
status
;
# one more rotation, to be sure Relay_log_space is correctly updated
flush
logs
;
...
...
@@ -78,7 +78,7 @@ drop table t1;
save_master_pos
;
connection
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
3306
MASTER_PORT
3334
MASTER_PORT
show
slave
status
;
connection
master
;
...
...
sql/log.cc
View file @
c36c37c3
...
...
@@ -584,7 +584,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
}
/* Start logging with a new file */
close
(
LOG_CLOSE_INDEX
|
LOG_CLOSE_STOP_EVENT
);
close
(
LOG_CLOSE_INDEX
);
my_delete
(
index_file_name
,
MYF
(
MY_WME
));
// Reset (open will update)
if
(
!
thd
->
slave_thread
)
need_start_event
=
1
;
...
...
@@ -1544,7 +1544,7 @@ void MYSQL_LOG::close(uint exiting)
{
// One can't set log_type here!
DBUG_ENTER
(
"MYSQL_LOG::close"
);
DBUG_PRINT
(
"enter"
,(
"exiting: %d"
,
(
int
)
exiting
));
if
(
is_open
()
)
if
(
log_type
!=
LOG_CLOSED
&&
log_type
!=
LOG_TO_BE_OPENED
)
{
if
(
log_type
==
LOG_BIN
&&
!
no_auto_events
&&
(
exiting
&
LOG_CLOSE_STOP_EVENT
))
...
...
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