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
fe9ee5c7
Commit
fe9ee5c7
authored
Feb 14, 2008
by
tomas@poseidon.bredbandsbolaget.se
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correct merge error
parent
be0324b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
+1
-1
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
+1
-1
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
+1
-1
No files found.
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
View file @
fe9ee5c7
...
...
@@ -64,7 +64,7 @@ connection master;
--
echo
# Now the insert, one step after
--
echo
--
replace_result
$start_pos
<
start_pos
>
--
replace_column
5
#
--
replace_column
2
#
5 #
--
eval
show
binlog
events
from
$start_pos
limit
1
,
1
--
echo
...
...
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
View file @
fe9ee5c7
...
...
@@ -34,7 +34,7 @@ master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN
show binlog events from <start_pos> limit 1,1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001
397
Query 1 # use `test`; insert into t1 values (1,2)
master-bin.000001
#
Query 1 # use `test`; insert into t1 values (1,2)
# and the COMMIT should be at <end_pos>
...
...
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
View file @
fe9ee5c7
...
...
@@ -34,7 +34,7 @@ master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN
show binlog events from <start_pos> limit 1,1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001
396
Query 1 # use `test`; insert into t1 values (1,2)
master-bin.000001
#
Query 1 # use `test`; insert into t1 values (1,2)
# and the COMMIT should be at <end_pos>
...
...
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