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
778c525f
Commit
778c525f
authored
Mar 20, 2019
by
sachin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17119 replicate_rewrite_db does not work for single chardatabase name
Fixed issue in logic.
parent
f00e25b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
2 deletions
+41
-2
mysql-test/suite/rpl/r/rpl_rewrt_db.result
mysql-test/suite/rpl/r/rpl_rewrt_db.result
+19
-0
mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
+1
-1
mysql-test/suite/rpl/t/rpl_rewrt_db.test
mysql-test/suite/rpl/t/rpl_rewrt_db.test
+19
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-1
No files found.
mysql-test/suite/rpl/r/rpl_rewrt_db.result
View file @
778c525f
include/master-slave.inc
[connection master]
set sql_log_bin=0;
create database y;
set sql_log_bin=1;
drop database if exists mysqltest1;
drop database if exists x;
create database mysqltest1;
set sql_log_bin=0;
create database x;
set sql_log_bin=1;
use mysqltest1;
create table t1 (a int);
insert into t1 values(9);
use x;
create table t1 (a int);
insert into t1 values(9);
select * from mysqltest1.t1;
a
9
select * from x.t1;
a
9
show databases like 'mysqltest1';
Database (mysqltest1)
mysqltest1
select * from test.t1;
a
9
select * from y.t1;
a
9
use mysqltest1;
drop table t1;
drop database mysqltest1;
drop database if exists rewrite;
...
...
@@ -209,10 +226,12 @@ SET sql_log_bin= 0;
DROP DATABASE database_master_temp_01;
DROP DATABASE database_master_temp_02;
DROP DATABASE database_master_temp_03;
DROP DATABASE x;
SET sql_log_bin= 1;
SET sql_log_bin= 0;
DROP DATABASE database_slave_temp_01;
DROP DATABASE database_slave_temp_02;
DROP DATABASE database_slave_temp_03;
DROP DATABASE y;
SET sql_log_bin= 1;
include/rpl_end.inc
mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
View file @
778c525f
"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1
->test"
"--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03"
"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1
-> test" "--replicate-rewrite-db=x -> y"
"--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03"
mysql-test/suite/rpl/t/rpl_rewrt_db.test
View file @
778c525f
...
...
@@ -2,20 +2,37 @@
--
source
include
/
have_binlog_format_mixed_or_statement
.
inc
--
source
include
/
master
-
slave
.
inc
--
connection
slave
set
sql_log_bin
=
0
;
create
database
y
;
set
sql_log_bin
=
1
;
--
connection
master
--
disable_warnings
drop
database
if
exists
mysqltest1
;
drop
database
if
exists
x
;
--
enable_warnings
create
database
mysqltest1
;
set
sql_log_bin
=
0
;
create
database
x
;
set
sql_log_bin
=
1
;
use
mysqltest1
;
create
table
t1
(
a
int
);
insert
into
t1
values
(
9
);
use
x
;
create
table
t1
(
a
int
);
insert
into
t1
values
(
9
);
select
*
from
mysqltest1
.
t1
;
select
*
from
x
.
t1
;
sync_slave_with_master
;
#TODO no it is no empty
show
databases
like
'mysqltest1'
;
# should be empty
select
*
from
test
.
t1
;
select
*
from
y
.
t1
;
# cleanup
connection
master
;
use
mysqltest1
;
drop
table
t1
;
drop
database
mysqltest1
;
sync_slave_with_master
;
...
...
@@ -224,6 +241,7 @@ SET sql_log_bin= 0;
DROP
DATABASE
database_master_temp_01
;
DROP
DATABASE
database_master_temp_02
;
DROP
DATABASE
database_master_temp_03
;
DROP
DATABASE
x
;
SET
sql_log_bin
=
1
;
connection
slave
;
...
...
@@ -231,6 +249,7 @@ SET sql_log_bin= 0;
DROP
DATABASE
database_slave_temp_01
;
DROP
DATABASE
database_slave_temp_02
;
DROP
DATABASE
database_slave_temp_03
;
DROP
DATABASE
y
;
SET
sql_log_bin
=
1
;
connection
master
;
...
...
sql/mysqld.cc
View file @
778c525f
...
...
@@ -7596,7 +7596,8 @@ mysqld_get_one_option(int optid,
val
=
p
--
;
while
(
my_isspace
(
mysqld_charset
,
*
p
)
&&
p
>
argument
)
*
p
--
=
0
;
if
(
p
==
argument
)
/* Db name can be one char also */
if
(
p
==
argument
&&
my_isspace
(
mysqld_charset
,
*
p
))
{
sql_print_error
(
"Bad syntax in replicate-rewrite-db - empty FROM db!
\n
"
);
return
1
;
...
...
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