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
e3c201d7
Commit
e3c201d7
authored
Mar 27, 2013
by
Sujatha Sivakumar
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.1 to mysql-5.5
parents
92c56b20
0e763f4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
mysql-test/suite/rpl/r/rpl_loaddata_m.result
mysql-test/suite/rpl/r/rpl_loaddata_m.result
+1
-1
mysql-test/suite/rpl/t/rpl_loaddata_m.test
mysql-test/suite/rpl/t/rpl_loaddata_m.test
+1
-1
sql/rpl_filter.cc
sql/rpl_filter.cc
+6
-3
No files found.
mysql-test/suite/rpl/r/rpl_loaddata_m.result
View file @
e3c201d7
...
...
@@ -33,5 +33,5 @@ SELECT COUNT(*) FROM mysqltest.t1;
COUNT(*)
2
DROP DATABASE mysqltest;
DROP TABLE test.t1;
DROP TABLE
IF EXISTS
test.t1;
include/rpl_end.inc
mysql-test/suite/rpl/t/rpl_loaddata_m.test
View file @
e3c201d7
...
...
@@ -44,7 +44,7 @@ SELECT COUNT(*) FROM mysqltest.t1;
# Cleanup
connection
master
;
DROP
DATABASE
mysqltest
;
DROP
TABLE
test
.
t1
;
DROP
TABLE
IF
EXISTS
test
.
t1
;
sync_slave_with_master
;
# End of test
...
...
sql/rpl_filter.cc
View file @
e3c201d7
...
...
@@ -154,11 +154,14 @@ Rpl_filter::db_ok(const char* db)
DBUG_RETURN
(
1
);
// Ok to replicate if the user puts no constraints
/*
If the user has specified restrictions on which databases to replicate
and db was not selected, do not replicate.
Previous behaviour "if the user has specified restrictions on which
databases to replicate and db was not selected, do not replicate" has
been replaced with "do replicate".
Since the filtering criteria is not equal to "NULL" the statement should
be logged into binlog.
*/
if
(
!
db
)
DBUG_RETURN
(
0
);
DBUG_RETURN
(
1
);
if
(
!
do_db
.
is_empty
())
// if the do's are not empty
{
...
...
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