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
3fc5b1b9
Commit
3fc5b1b9
authored
Sep 01, 2008
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
2f4a80a3
d66b8fcb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
19 deletions
+11
-19
mysql-test/extra/rpl_tests/rpl_log.test
mysql-test/extra/rpl_tests/rpl_log.test
+7
-11
mysql-test/suite/rpl/r/rpl_row_log.result
mysql-test/suite/rpl/r/rpl_row_log.result
+1
-2
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
+1
-2
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/r/rpl_stm_log.result
+1
-2
mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
+1
-1
mysql-test/suite/rpl/t/rpl_view-slave.opt
mysql-test/suite/rpl/t/rpl_view-slave.opt
+0
-1
No files found.
mysql-test/extra/rpl_tests/rpl_log.test
View file @
3fc5b1b9
...
@@ -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
;
eval
create
table
t1
(
n
int
not
null
auto_increment
primary
key
)
ENGINE
=
$engine_type
;
eval
create
table
t1
(
n
int
not
null
auto_increment
primary
key
)
ENGINE
=
$engine_type
;
insert
into
t1
values
(
NULL
);
insert
into
t1
values
(
NULL
);
drop
table
t1
;
drop
table
t1
;
...
@@ -79,7 +72,6 @@ connection slave;
...
@@ -79,7 +72,6 @@ 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
;
let
$result_pattern
=
'%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%'
;
let
$result_pattern
=
'%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%'
;
--
source
include
/
wait_slave_status
.
inc
--
source
include
/
wait_slave_status
.
inc
sync_with_master
;
sync_with_master
;
...
@@ -87,6 +79,7 @@ sync_with_master;
...
@@ -87,6 +79,7 @@ sync_with_master;
select
*
from
t1
order
by
1
asc
;
select
*
from
t1
order
by
1
asc
;
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
...
@@ -95,6 +88,7 @@ eval create table t2 (n int)ENGINE=$engine_type;
...
@@ -95,6 +88,7 @@ eval create table t2 (n int)ENGINE=$engine_type;
insert
into
t2
values
(
1
);
insert
into
t2
values
(
1
);
source
include
/
show_binlog_events
.
inc
;
source
include
/
show_binlog_events
.
inc
;
--
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'/
--
replace_column
2
# 5 #
--
replace_column
2
# 5 #
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/
show
binlog
events
in
'master-bin.000002'
;
show
binlog
events
in
'master-bin.000002'
;
...
@@ -102,10 +96,12 @@ show binary logs;
...
@@ -102,10 +96,12 @@ 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_column
2
# 5 #
--
replace_column
2
# 5 #
--
replace_regex
/
file_id
=
[
0
-
9
]
+/
file_id
=
#/ /block_len=[0-9]+/block_len=#/ /INFILE '.+'/INFILE 'words.dat'/
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/
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
...
...
mysql-test/suite/rpl/r/rpl_row_log.result
View file @
3fc5b1b9
...
@@ -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)ENGINE=MyISAM;
create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
insert into t1 values (NULL);
insert into t1 values (NULL);
drop table t1;
drop table t1;
...
@@ -113,7 +113,6 @@ Aberdeen
...
@@ -113,7 +113,6 @@ Aberdeen
Abernathy
Abernathy
aberrant
aberrant
aberration
aberration
start slave;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
...
...
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View file @
3fc5b1b9
...
@@ -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)ENGINE=InnoDB;
create table t1(n int not null auto_increment primary key)ENGINE=InnoDB;
insert into t1 values (NULL);
insert into t1 values (NULL);
drop table t1;
drop table t1;
...
@@ -113,7 +113,6 @@ Aberdeen
...
@@ -113,7 +113,6 @@ Aberdeen
Abernathy
Abernathy
aberrant
aberrant
aberration
aberration
start slave;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
...
...
mysql-test/suite/rpl/r/rpl_stm_log.result
View file @
3fc5b1b9
...
@@ -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)ENGINE=MyISAM;
create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
insert into t1 values (NULL);
insert into t1 values (NULL);
drop table t1;
drop table t1;
...
@@ -109,7 +109,6 @@ Aberdeen
...
@@ -109,7 +109,6 @@ Aberdeen
Abernathy
Abernathy
aberrant
aberrant
aberration
aberration
start slave;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
...
...
mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
View file @
3fc5b1b9
--log-slave-updates
mysql-test/suite/rpl/t/rpl_view-slave.opt
deleted
100644 → 0
View file @
2f4a80a3
--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