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
52141691
Commit
52141691
authored
Sep 01, 2008
by
Mats Kindahl
Browse files
Options
Browse Files
Download
Plain Diff
Merging in 5.0-rpl into 5.0-bugteam
parents
1aac55a6
09d41236
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
23 deletions
+16
-23
mysql-test/r/rpl_log.result
mysql-test/r/rpl_log.result
+7
-8
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-2
mysql-test/t/rpl_log-slave.opt
mysql-test/t/rpl_log-slave.opt
+1
-1
mysql-test/t/rpl_log.test
mysql-test/t/rpl_log.test
+8
-11
mysql-test/t/rpl_view-slave.opt
mysql-test/t/rpl_view-slave.opt
+0
-1
No files found.
mysql-test/r/rpl_log.result
View file @
52141691
...
@@ -7,7 +7,7 @@ start slave;
...
@@ -7,7 +7,7 @@ start slave;
stop slave;
stop slave;
reset master;
reset master;
reset slave;
reset slave;
reset master
;
start slave
;
create table t1(n int not null auto_increment primary key);
create table t1(n int not null auto_increment primary key);
insert into t1 values (NULL);
insert into t1 values (NULL);
drop table t1;
drop table t1;
...
@@ -25,8 +25,8 @@ master-bin.000001 219 Intvar 1 247 INSERT_ID=1
...
@@ -25,8 +25,8 @@ master-bin.000001 219 Intvar 1 247 INSERT_ID=1
master-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
master-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
master-bin.000001 338 Query 1 414 use `test`; drop table t1
master-bin.000001 338 Query 1 414 use `test`; drop table t1
master-bin.000001 414 Query 1 517 use `test`; create table t1 (word char(20) not null)
master-bin.000001 414 Query 1 517 use `test`; create table t1 (word char(20) not null)
master-bin.000001 517 Begin_load_query 1 1121 ;file_id=
1;block_len=581
master-bin.000001 517 Begin_load_query 1 1121 ;file_id=
#;block_len=#
master-bin.000001 1121 Execute_load_query 1 1269 use `test`; load data infile '
../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
master-bin.000001 1121 Execute_load_query 1 1269 use `test`; load data infile '
words.dat' into table t1 ignore 1 lines ;file_id=#
master-bin.000001 1269 Query 1 1345 use `test`; drop table t1
master-bin.000001 1269 Query 1 1345 use `test`; drop table t1
show binlog events from 98 limit 1;
show binlog events from 98 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
Log_name Pos Event_type Server_id End_log_pos Info
...
@@ -41,7 +41,6 @@ master-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
...
@@ -41,7 +41,6 @@ master-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
flush logs;
flush logs;
create table t5 (a int);
create table t5 (a int);
drop table t5;
drop table t5;
start slave;
flush logs;
flush logs;
stop slave;
stop slave;
create table t1 (n int);
create table t1 (n int);
...
@@ -55,8 +54,8 @@ master-bin.000001 219 Intvar 1 247 INSERT_ID=1
...
@@ -55,8 +54,8 @@ master-bin.000001 219 Intvar 1 247 INSERT_ID=1
master-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
master-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
master-bin.000001 338 Query 1 414 use `test`; drop table t1
master-bin.000001 338 Query 1 414 use `test`; drop table t1
master-bin.000001 414 Query 1 517 use `test`; create table t1 (word char(20) not null)
master-bin.000001 414 Query 1 517 use `test`; create table t1 (word char(20) not null)
master-bin.000001 517 Begin_load_query 1 1121 ;file_id=
1;block_len=581
master-bin.000001 517 Begin_load_query 1 1121 ;file_id=
#;block_len=#
master-bin.000001 1121 Execute_load_query 1 1269 use `test`; load data infile '
../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
master-bin.000001 1121 Execute_load_query 1 1269 use `test`; load data infile '
words.dat' into table t1 ignore 1 lines ;file_id=#
master-bin.000001 1269 Query 1 1345 use `test`; drop table t1
master-bin.000001 1269 Query 1 1345 use `test`; drop table t1
master-bin.000001 1345 Rotate 1 1389 master-bin.000002;pos=4
master-bin.000001 1345 Rotate 1 1389 master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
show binlog events in 'master-bin.000002';
...
@@ -84,8 +83,8 @@ slave-bin.000001 219 Intvar 1 247 INSERT_ID=1
...
@@ -84,8 +83,8 @@ slave-bin.000001 219 Intvar 1 247 INSERT_ID=1
slave-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
slave-bin.000001 247 Query 1 338 use `test`; insert into t1 values (NULL)
slave-bin.000001 338 Query 1 414 use `test`; drop table t1
slave-bin.000001 338 Query 1 414 use `test`; drop table t1
slave-bin.000001 414 Query 1 517 use `test`; create table t1 (word char(20) not null)
slave-bin.000001 414 Query 1 517 use `test`; create table t1 (word char(20) not null)
slave-bin.000001 517 Begin_load_query 1 1121 ;file_id=
1;block_len=581
slave-bin.000001 517 Begin_load_query 1 1121 ;file_id=
#;block_len=#
slave-bin.000001 1121 Execute_load_query 1 1271 use `test`; load data INFILE '
../tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
slave-bin.000001 1121 Execute_load_query 1 1271 use `test`; load data INFILE '
words.dat' INTO table t1 ignore 1 lines ;file_id=#
slave-bin.000001 1271 Query 1 1347 use `test`; drop table t1
slave-bin.000001 1271 Query 1 1347 use `test`; drop table t1
slave-bin.000001 1347 Query 1 1433 use `test`; create table t5 (a int)
slave-bin.000001 1347 Query 1 1433 use `test`; create table t5 (a int)
slave-bin.000001 1433 Query 1 1509 use `test`; drop table t5
slave-bin.000001 1433 Query 1 1509 use `test`; drop table t5
...
...
mysql-test/t/disabled.def
View file @
52141691
...
@@ -17,8 +17,6 @@ im_options_set : Bug#20294: Instance manager tests fail randomly
...
@@ -17,8 +17,6 @@ im_options_set : Bug#20294: Instance manager tests fail randomly
im_options_unset : Bug#20294: Instance manager tests fail randomly
im_options_unset : Bug#20294: Instance manager tests fail randomly
im_utils : Bug#20294: Instance manager tests fail randomly
im_utils : Bug#20294: Instance manager tests fail randomly
grant_cache : Bug#32651: grant_cache.test fails
grant_cache : Bug#32651: grant_cache.test fails
rpl_log : Bug#32653: rpl_log.test fails randomly
rpl_view : Bug#32654: rpl_view.test fails randomly
ndb_backup_print : Bug#32357: ndb_backup_print test fails sometimes in pushbuild
ndb_backup_print : Bug#32357: ndb_backup_print test fails sometimes in pushbuild
rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
kill : Bug#29149 Test "kill" fails on Windows
kill : Bug#29149 Test "kill" fails on Windows
mysql-test/t/rpl_log-slave.opt
View file @
52141691
--log-slave-updates
mysql-test/t/rpl_log.test
View file @
52141691
...
@@ -13,22 +13,15 @@ save_master_pos;
...
@@ -13,22 +13,15 @@ save_master_pos;
connection
slave
;
connection
slave
;
sync_with_master
;
sync_with_master
;
stop
slave
;
stop
slave
;
--
source
include
/
wait_for_slave_to_stop
.
inc
reset
master
;
reset
master
;
reset
slave
;
reset
slave
;
# We are going to read the slave's binlog which contains file_id (for some LOAD
start
slave
;
# DATA INFILE); to make it repeatable (not influenced by other tests), we need
--
source
include
/
wait_for_slave_to_start
.
inc
# to stop and start the slave, to be sure file_id will start from 1.
# This can be done with 'server_stop slave', but
# this would require the manager, so most of the time the test will be skipped
# :(
# To workaround this, I (Guilhem) add a (empty) rpl_log-slave.opt (because when
# mysql-test-run finds such a file it restarts the slave before doing the
# test). That's not very elegant but I could find no better way, sorry.
let
$VERSION
=
`select version()`
;
let
$VERSION
=
`select version()`
;
connection
master
;
connection
master
;
reset
master
;
create
table
t1
(
n
int
not
null
auto_increment
primary
key
);
create
table
t1
(
n
int
not
null
auto_increment
primary
key
);
insert
into
t1
values
(
NULL
);
insert
into
t1
values
(
NULL
);
drop
table
t1
;
drop
table
t1
;
...
@@ -37,6 +30,7 @@ load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
...
@@ -37,6 +30,7 @@ load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
select
count
(
*
)
from
t1
;
select
count
(
*
)
from
t1
;
drop
table
t1
;
drop
table
t1
;
--
replace_result
$VERSION
VERSION
--
replace_result
$VERSION
VERSION
--
replace_regex
/
file_id
=
[
0
-
9
]
+/
file_id
=
#/ /block_len=[0-9]+/block_len=#/ /infile '.+'/infile 'words.dat'/
show
binlog
events
;
show
binlog
events
;
show
binlog
events
from
98
limit
1
;
show
binlog
events
from
98
limit
1
;
show
binlog
events
from
98
limit
2
;
show
binlog
events
from
98
limit
2
;
...
@@ -69,10 +63,10 @@ connection slave;
...
@@ -69,10 +63,10 @@ connection slave;
# Note that the above 'slave start' will cause a 3rd rotate event (a fake one)
# Note that the above 'slave start' will cause a 3rd rotate event (a fake one)
# to go into the relay log (the master always sends a fake one when replication
# to go into the relay log (the master always sends a fake one when replication
# starts).
# starts).
start
slave
;
sync_with_master
;
sync_with_master
;
flush
logs
;
flush
logs
;
stop
slave
;
stop
slave
;
--
source
include
/
wait_for_slave_to_stop
.
inc
connection
master
;
connection
master
;
# Create some entries for second log
# Create some entries for second log
...
@@ -81,6 +75,7 @@ create table t1 (n int);
...
@@ -81,6 +75,7 @@ create table t1 (n int);
insert
into
t1
values
(
1
);
insert
into
t1
values
(
1
);
drop
table
t1
;
drop
table
t1
;
--
replace_result
$VERSION
VERSION
--
replace_result
$VERSION
VERSION
--
replace_regex
/
file_id
=
[
0
-
9
]
+/
file_id
=
#/ /block_len=[0-9]+/block_len=#/ /infile '.+'/infile 'words.dat'/
show
binlog
events
;
show
binlog
events
;
--
replace_result
$VERSION
VERSION
--
replace_result
$VERSION
VERSION
show
binlog
events
in
'master-bin.000002'
;
show
binlog
events
in
'master-bin.000002'
;
...
@@ -88,9 +83,11 @@ show binary logs;
...
@@ -88,9 +83,11 @@ show binary logs;
save_master_pos
;
save_master_pos
;
connection
slave
;
connection
slave
;
start
slave
;
start
slave
;
--
source
include
/
wait_for_slave_to_start
.
inc
sync_with_master
;
sync_with_master
;
show
binary
logs
;
show
binary
logs
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
$VERSION
VERSION
--
replace_result
$MASTER_MYPORT
MASTER_PORT
$VERSION
VERSION
--
replace_regex
/
file_id
=
[
0
-
9
]
+/
file_id
=
#/ /block_len=[0-9]+/block_len=#/ /INFILE '.+'/INFILE 'words.dat'/
show
binlog
events
in
'slave-bin.000001'
from
4
;
show
binlog
events
in
'slave-bin.000001'
from
4
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
$VERSION
VERSION
--
replace_result
$MASTER_MYPORT
MASTER_PORT
$VERSION
VERSION
show
binlog
events
in
'slave-bin.000002'
from
4
;
show
binlog
events
in
'slave-bin.000002'
from
4
;
...
...
mysql-test/t/rpl_view-slave.opt
deleted
100644 → 0
View file @
1aac55a6
--replicate-ignore-table=test.foo
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