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
2c957837
Commit
2c957837
authored
Feb 13, 2008
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction of merge
parent
f343addf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
15 deletions
+41
-15
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
+17
-4
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+6
-3
mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
+2
-6
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
+16
-2
No files found.
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
View file @
2c957837
...
@@ -50,17 +50,30 @@ insert into t1 values (1,2);
...
@@ -50,17 +50,30 @@ insert into t1 values (1,2);
--
echo
--
echo
connection
master
;
connection
master
;
# here is actually a bug, since there is no begin statement, the
--
echo
# Now check that that is in the apply_status table is consistant
# query is autocommitted, and end_pos shows end of the insert and not
--
echo
# with what is in the binlog
# end of the commit
--
echo
--
echo
# since insert is done with transactional engine, expect a BEGIN
--
echo
# at <start_pos>
--
echo
--
replace_result
$start_pos
<
start_pos
>
--
replace_result
$start_pos
<
start_pos
>
--
replace_column
5
#
--
replace_column
5
#
--
eval
show
binlog
events
from
$start_pos
limit
1
--
eval
show
binlog
events
from
$start_pos
limit
1
--
echo
--
echo
# Now the insert, one step after
--
echo
--
replace_result
$start_pos
<
start_pos
>
--
replace_column
5
#
--
eval
show
binlog
events
from
$start_pos
limit
1
,
1
--
echo
--
echo
# and the COMMIT should be at <end_pos>
--
echo
--
echo
--
replace_result
$start_pos
<
start_pos
>
$end_pos
<
end_pos
>
--
replace_result
$start_pos
<
start_pos
>
$end_pos
<
end_pos
>
--
replace_column
2
#
--
replace_column
2
#
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/
--
eval
show
binlog
events
from
$start_pos
limit
1
,
1
--
eval
show
binlog
events
from
$start_pos
limit
2
,
1
--
echo
--
echo
...
...
mysql-test/mysql-test-run.pl
View file @
2c957837
...
@@ -136,9 +136,12 @@ our $opt_suites;
...
@@ -136,9 +136,12 @@ our $opt_suites;
our
$opt_suites_default
=
"
main,binlog,rpl,rpl_ndb,ndb
";
# Default suites to run
our
$opt_suites_default
=
"
main,binlog,rpl,rpl_ndb,ndb
";
# Default suites to run
our
@extra_suites
=
our
@extra_suites
=
(
(
["
mysql-5.1-new-ndb
",
"
ndb_team
"],
["
mysql-5.1-new-ndb
",
"
ndb_team
"],
["
mysql-5.1-telco-6.2
",
"
ndb_team
"],
["
mysql-5.1-new-ndb-merge
",
"
ndb_team
"],
["
mysql-5.1-telco-6.3
",
"
ndb_team
"],
["
mysql-5.1-telco-6.2
",
"
ndb_team
"],
["
mysql-5.1-telco-6.2-merge
",
"
ndb_team
"],
["
mysql-5.1-telco-6.3
",
"
ndb_team
"],
["
mysql-6.0-ndb
",
"
ndb_team
"],
);
);
...
...
mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
View file @
2c957837
...
@@ -454,9 +454,7 @@ f1 f2 f3 f4
...
@@ -454,9 +454,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6;
update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2;
update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1;
update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master **
** Delete from Master **
...
@@ -1595,9 +1593,7 @@ f1 f2 f3 f4
...
@@ -1595,9 +1593,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6;
update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2;
update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1;
update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master **
** Delete from Master **
...
...
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
View file @
2c957837
...
@@ -20,13 +20,27 @@ from mysql.ndb_apply_status;
...
@@ -20,13 +20,27 @@ from mysql.ndb_apply_status;
@log_name:=log_name @start_pos:=start_pos @end_pos:=end_pos
@log_name:=log_name @start_pos:=start_pos @end_pos:=end_pos
<log_name> <start_pos> <end_pos>
<log_name> <start_pos> <end_pos>
# Now check that that is in the apply_status table is consistant
# with what is in the binlog
# since insert is done with transactional engine, expect a BEGIN
# at <start_pos>
show binlog events from <start_pos> limit 1;
show binlog events from <start_pos> limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 <start_pos> Query 1 # use `test`; insert into t1 values (1,2)
master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN
# Now the insert, one step after
show binlog events from <start_pos> limit 1,1;
show binlog events from <start_pos> limit 1,1;
Log_name Pos Event_type Server_id End_log_pos Info
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Xid 1 445 COMMIT /* XID */
master-bin.000001 397 Query 1 # use `test`; insert into t1 values (1,2)
# and the COMMIT should be at <end_pos>
show binlog events from <start_pos> limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Xid 1 <end_pos> COMMIT /* XID */
begin;
begin;
insert into t1 values (2,3);
insert into t1 values (2,3);
...
...
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