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
4e55c9a1
Commit
4e55c9a1
authored
Nov 06, 2007
by
mats@kindahl-laptop.dnsalias.net
Browse files
Options
Browse Files
Download
Plain Diff
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
parents
f5106b3f
3f7bf588
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
515 additions
and
50 deletions
+515
-50
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
+67
-2
mysql-test/extra/rpl_tests/rpl_truncate_helper.test
mysql-test/extra/rpl_tests/rpl_truncate_helper.test
+8
-6
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+99
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+5
-0
mysql-test/suite/binlog/r/binlog_killed.result
mysql-test/suite/binlog/r/binlog_killed.result
+32
-23
mysql-test/suite/binlog/t/binlog_killed.test
mysql-test/suite/binlog/t/binlog_killed.test
+31
-19
mysql-test/suite/binlog/t/binlog_killed_simulate.test
mysql-test/suite/binlog/t/binlog_killed_simulate.test
+1
-0
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
+60
-0
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
+60
-0
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
+42
-0
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
+42
-0
mysql-test/suite/rpl/t/rpl_row_until.test
mysql-test/suite/rpl/t/rpl_row_until.test
+4
-0
mysql-test/suite/rpl/t/rpl_stm_until.test
mysql-test/suite/rpl/t/rpl_stm_until.test
+4
-0
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
+60
-0
No files found.
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
View file @
4e55c9a1
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
########### Clean up ################
########### Clean up ################
--
disable_warnings
--
disable_warnings
--
disable_query_log
--
disable_query_log
DROP
TABLE
IF
EXISTS
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
,
t10
,
t11
,
t12
,
t13
,
t14
,
t15
,
t16
,
t17
;
DROP
TABLE
IF
EXISTS
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
,
t10
,
t11
,
t12
,
t13
,
t14
,
t1
4a
,
t1
5
,
t16
,
t17
;
--
enable_query_log
--
enable_query_log
--
enable_warnings
--
enable_warnings
...
@@ -662,6 +662,68 @@ sync_slave_with_master;
...
@@ -662,6 +662,68 @@ sync_slave_with_master;
--
replace_column
7
CURRENT_TIMESTAMP
--
replace_column
7
CURRENT_TIMESTAMP
SELECT
*
FROM
t14
ORDER
BY
c1
;
SELECT
*
FROM
t14
ORDER
BY
c1
;
####################################################
# - Alter Master drop column at end of table #
# Expect: column dropped #
####################################################
--
echo
***
Create
t14a
on
slave
***
STOP
SLAVE
;
RESET
SLAVE
;
eval
CREATE
TABLE
t14a
(
c1
INT
KEY
,
c4
BLOB
,
c5
CHAR
(
5
),
c6
INT
DEFAULT
'1'
,
c7
TIMESTAMP
NULL
DEFAULT
CURRENT_TIMESTAMP
)
ENGINE
=
$engine_type
;
--
echo
***
Create
t14a
on
Master
***
connection
master
;
eval
CREATE
TABLE
t14a
(
c1
INT
PRIMARY
KEY
,
c4
BLOB
,
c5
CHAR
(
5
)
)
ENGINE
=
$engine_type
;
RESET
MASTER
;
--
echo
***
Start
Slave
***
connection
slave
;
START
SLAVE
;
--
echo
***
Master
Data
Insert
***
connection
master
;
set
@
b1
=
'b1b1b1b1'
;
set
@
b1
=
concat
(
@
b1
,
@
b1
);
INSERT
INTO
t14a
()
VALUES
(
1
,
@
b1
,
'Kyle'
),
(
2
,
@
b1
,
'JOE'
),
(
3
,
@
b1
,
'QA'
);
SELECT
*
FROM
t14a
ORDER
BY
c1
;
--
echo
***
Select
on
Slave
****
sync_slave_with_master
;
--
replace_column
5
CURRENT_TIMESTAMP
SELECT
*
FROM
t14a
ORDER
BY
c1
;
STOP
SLAVE
;
RESET
SLAVE
;
--
echo
***
Master
Drop
c5
***
connection
master
;
ALTER
TABLE
t14a
DROP
COLUMN
c5
;
RESET
MASTER
;
--
echo
***
Start
Slave
***
connection
slave
;
START
SLAVE
;
--
echo
***
Master
Data
Insert
***
connection
master
;
set
@
b1
=
'b1b1b1b1'
;
set
@
b1
=
concat
(
@
b1
,
@
b1
);
INSERT
INTO
t14a
()
VALUES
(
4
,
@
b1
),
(
5
,
@
b1
),
(
6
,
@
b1
);
SELECT
*
FROM
t14a
ORDER
BY
c1
;
--
echo
***
Select
on
Slave
****
sync_slave_with_master
;
--
replace_column
5
CURRENT_TIMESTAMP
SELECT
*
FROM
t14a
ORDER
BY
c1
;
####################################################
####################################################
# - Alter Master Dropping columns from the middle. #
# - Alter Master Dropping columns from the middle. #
...
@@ -858,7 +920,10 @@ sync_slave_with_master;
...
@@ -858,7 +920,10 @@ sync_slave_with_master;
#### Clean Up ####
#### Clean Up ####
--
disable_warnings
--
disable_warnings
--
disable_query_log
--
disable_query_log
DROP
TABLE
IF
EXISTS
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
,
t10
,
t11
,
t12
,
t13
,
t14
,
t15
,
t16
,
t17
;
connection
master
;
DROP
TABLE
IF
EXISTS
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
,
t10
,
t11
,
t12
,
t13
,
t14
,
t14a
,
t15
,
t16
,
t17
;
sync_slave_with_master
;
connection
master
;
--
enable_query_log
--
enable_query_log
--
enable_warnings
--
enable_warnings
...
...
mysql-test/extra/rpl_tests/rpl_truncate_helper.test
View file @
4e55c9a1
--
disable_query_log
--
disable_warnings
connection
slave
;
connection
slave
;
STOP
SLAVE
;
STOP
SLAVE
;
source
include
/
wait_for_slave_to_stop
.
inc
;
connection
master
;
connection
master
;
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
DROP
TABLE
IF
EXISTS
t1
;
RESET
MASTER
;
--
enable_warnings
connection
slave
;
connection
slave
;
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
DROP
TABLE
IF
EXISTS
t1
;
--
enable_warnings
RESET
SLAVE
;
RESET
SLAVE
;
START
SLAVE
;
START
SLAVE
;
--
enable_warnings
--
enable_query_log
--
echo
****
On
Master
****
--
echo
****
On
Master
****
connection
master
;
connection
master
;
...
@@ -38,3 +37,6 @@ connection master;
...
@@ -38,3 +37,6 @@ connection master;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
let
$SERVER_VERSION
=
`select version()`
;
let
$SERVER_VERSION
=
`select version()`
;
source
include
/
show_binlog_events
.
inc
;
source
include
/
show_binlog_events
.
inc
;
connection
master
;
RESET
MASTER
;
mysql-test/lib/mtr_cases.pl
View file @
4e55c9a1
...
@@ -214,17 +214,44 @@ sub collect_one_suite($$)
...
@@ -214,17 +214,44 @@ sub collect_one_suite($$)
mtr_verbose
("
Collecting:
$suite
");
mtr_verbose
("
Collecting:
$suite
");
my
$combination_file
=
"
combinations
";
my
$combinations
=
[]
;
my
$suitedir
=
"
$::glob_mysql_test_dir
";
# Default
my
$suitedir
=
"
$::glob_mysql_test_dir
";
# Default
my
$combination_file
=
"
$::glob_mysql_test_dir/
$combination_file
";
if
(
$suite
ne
"
main
"
)
if
(
$suite
ne
"
main
"
)
{
{
$suitedir
=
mtr_path_exists
("
$suitedir
/suite/
$suite
",
$suitedir
=
mtr_path_exists
("
$suitedir
/suite/
$suite
",
"
$suitedir
/
$suite
");
"
$suitedir
/
$suite
");
mtr_verbose
("
suitedir:
$suitedir
");
mtr_verbose
("
suitedir:
$suitedir
");
$combination_file
=
"
$suitedir
/
$combination_file
";
}
}
my
$testdir
=
"
$suitedir
/t
";
my
$testdir
=
"
$suitedir
/t
";
my
$resdir
=
"
$suitedir
/r
";
my
$resdir
=
"
$suitedir
/r
";
if
(
!
@::opt_combination
)
{
# Read combinations file
if
(
open
(
COMB
,
$combination_file
)
)
{
while
(
<
COMB
>
)
{
chomp
;
s/\ +/ /g
;
push
(
@$combinations
,
$_
)
unless
(
$_
eq
'');
}
close
COMB
;
}
}
else
{
# take the combination from command-line
@$combinations
=
@::opt_combination
;
}
# Remember last element position
my
$begin_index
=
$#
{
@$cases
}
+
1
;
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# Build a hash of disabled testcases for this suite
# Build a hash of disabled testcases for this suite
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
@@ -335,6 +362,78 @@ sub collect_one_suite($$)
...
@@ -335,6 +362,78 @@ sub collect_one_suite($$)
closedir
TESTDIR
;
closedir
TESTDIR
;
}
}
# ----------------------------------------------------------------------
# Proccess combinations only if new tests were added
# ----------------------------------------------------------------------
if
(
$combinations
&&
$begin_index
<=
$#
{
@$cases
})
{
my
$end_index
=
$#
{
@$cases
};
my
$is_copy
;
# Keep original master/slave options
my
@orig_opts
;
for
(
my
$idx
=
$begin_index
;
$idx
<=
$end_index
;
$idx
++
)
{
foreach
my
$param
(('
master_opt
','
slave_opt
','
slave_mi
'))
{
@
{
$orig_opts
[
$idx
]{
$param
}}
=
@
{
$cases
->
[
$idx
]
->
{
$param
}};
}
}
my
$comb_index
=
1
;
# Copy original test cases
foreach
my
$comb_set
(
@$combinations
)
{
for
(
my
$idx
=
$begin_index
;
$idx
<=
$end_index
;
$idx
++
)
{
my
$test
=
$cases
->
[
$idx
];
my
$copied_test
=
{};
foreach
my
$param
(
keys
%
{
$test
})
{
# Scalar. Copy as is.
$copied_test
->
{
$param
}
=
$test
->
{
$param
};
# Array. Copy reference instead itself
if
(
$param
=~
/(master_opt|slave_opt|slave_mi)/
)
{
my
$new_arr
=
[]
;
@$new_arr
=
@
{
$orig_opts
[
$idx
]{
$param
}};
$copied_test
->
{
$param
}
=
$new_arr
;
}
elsif
(
$param
=~
/(comment|combinations)/
)
{
$copied_test
->
{
$param
}
=
'';
}
}
if
(
$is_copy
)
{
push
(
@$cases
,
$copied_test
);
$test
=
$cases
->
[
$#
{
@$cases
}];
}
foreach
my
$comb_opt
(
split
(
/ /
,
$comb_set
))
{
push
(
@
{
$test
->
{'
master_opt
'}},
$comb_opt
);
push
(
@
{
$test
->
{'
slave_opt
'}},
$comb_opt
);
# Enable rpl if added option is --binlog-format and test case supports that
if
(
$comb_opt
=~
/^--binlog-format=.+$/
)
{
my
@opt_pairs
=
split
(
/=/
,
$comb_opt
);
if
(
$test
->
{'
binlog_format
'}
=~
/^$opt_pairs[1]$/
||
$test
->
{'
binlog_format
'}
eq
'')
{
$test
->
{'
skip
'}
=
0
;
$test
->
{'
comment
'}
=
'';
}
else
{
$test
->
{'
skip
'}
=
1
;
$test
->
{'
comment
'}
=
"
Requiring binlog format '
$test
->{'binlog_format'}'
";;
}
}
}
$test
->
{'
combination
'}
=
$comb_set
;
}
$is_copy
=
1
;
$comb_index
++
;
}
}
return
$cases
;
return
$cases
;
}
}
...
...
mysql-test/mysql-test-run.pl
View file @
4e55c9a1
...
@@ -164,6 +164,8 @@ our $opt_bench= 0;
...
@@ -164,6 +164,8 @@ our $opt_bench= 0;
our
$opt_small_bench
=
0
;
our
$opt_small_bench
=
0
;
our
$opt_big_test
=
0
;
our
$opt_big_test
=
0
;
our
@opt_combination
;
our
@opt_extra_mysqld_opt
;
our
@opt_extra_mysqld_opt
;
our
$opt_compress
;
our
$opt_compress
;
...
@@ -529,6 +531,7 @@ sub command_line_setup () {
...
@@ -529,6 +531,7 @@ sub command_line_setup () {
'
skip-im
'
=>
\
$opt_skip_im
,
'
skip-im
'
=>
\
$opt_skip_im
,
'
skip-test=s
'
=>
\
$opt_skip_test
,
'
skip-test=s
'
=>
\
$opt_skip_test
,
'
big-test
'
=>
\
$opt_big_test
,
'
big-test
'
=>
\
$opt_big_test
,
'
combination=s
'
=>
\
@opt_combination
,
# Specify ports
# Specify ports
'
master_port=i
'
=>
\
$opt_master_myport
,
'
master_port=i
'
=>
\
$opt_master_myport
,
...
@@ -5134,6 +5137,8 @@ Options to control what test suites or cases to run
...
@@ -5134,6 +5137,8 @@ Options to control what test suites or cases to run
skip-im Don't start IM, and skip the IM test cases
skip-im Don't start IM, and skip the IM test cases
big-test Set the environment variable BIG_TEST, which can be
big-test Set the environment variable BIG_TEST, which can be
checked from test cases.
checked from test cases.
combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one
combination.
Options that specify ports
Options that specify ports
...
...
mysql-test/suite/binlog/r/binlog_killed.result
View file @
4e55c9a1
...
@@ -17,8 +17,7 @@ update t1 set b=11 where a=2;
...
@@ -17,8 +17,7 @@ update t1 set b=11 where a=2;
update t1 set b=b+10;
update t1 set b=b+10;
kill query ID;
kill query ID;
rollback;
rollback;
ERROR 70100: Query execution was interrupted
select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
select * from t1 /* must be the same as before (1,1),(2,2) */;
a b
a b
1 1
1 1
2 2
2 2
...
@@ -27,8 +26,7 @@ delete from t1 where a=2;
...
@@ -27,8 +26,7 @@ delete from t1 where a=2;
delete from t1 where a=2;
delete from t1 where a=2;
kill query ID;
kill query ID;
rollback;
rollback;
ERROR 70100: Query execution was interrupted
select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
select * from t1 /* must be the same as before (1,1),(2,2) */;
a b
a b
1 1
1 1
2 2
2 2
...
@@ -41,39 +39,45 @@ begin;
...
@@ -41,39 +39,45 @@ begin;
insert into t1 select * from t4 for update;
insert into t1 select * from t4 for update;
kill query ID;
kill query ID;
rollback;
rollback;
ERROR 70100: Query execution was interrupted
rollback;
rollback;
select * from t1 /* must be the same as before (1,1),(2,2) */;
select * from t1 /* must be the same as before (1,1),(2,2) */;
a b
a b
1 1
1 1
2 2
2 2
drop table t4;
drop table t4;
create table t4 (a int, b int) ENGINE=MyISAM /* for killing update and delete */;
create function bug27563(n int)
create function bug27563(n int)
RETURNS int(11)
RETURNS int(11)
DETERMINISTIC
DETERMINISTIC
begin
begin
if
n > 1
then
if
@b > 0
then
select get_lock("a", 10) into @a;
select get_lock("a", 10) into @a;
else
set @b= 1;
end if;
end if;
return n;
return n;
end|
end|
delete from t
2
;
delete from t
4
;
insert into t
2 values (1,1), (2,2
);
insert into t
4 values (1,1), (1,1
);
reset master;
reset master;
select get_lock("a", 20);
select get_lock("a", 20);
get_lock("a", 20)
get_lock("a", 20)
1
1
update t2 set b=b + bug27563(b) order by a;
set @b= 0;
update t4 set b=b + bug27563(b);
kill query ID;
kill query ID;
ERROR 70100: Query execution was interrupted
select * from t4 order by b /* must be (1,1), (1,2) */;
select * from t2 /* must be (1,2), (2,2) */;
a b
a b
1 1
1 2
1 2
2 2
select @b /* must be 1 at the end of a stmt calling bug27563() */;
must have the update event more to FD
@b
1
must have the update query event more to FD
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; update t2 set b=b + bug27563(b) order by a
master-bin.000001 # User var # # @`b`=0
master-bin.000001 # Query # # use `test`; update t4 set b=b + bug27563(b)
select
select
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
is not null;
is not null;
...
@@ -86,22 +90,26 @@ select 0 /* must return 0 to mean the killed query is in */;
...
@@ -86,22 +90,26 @@ select 0 /* must return 0 to mean the killed query is in */;
select RELEASE_LOCK("a");
select RELEASE_LOCK("a");
RELEASE_LOCK("a")
RELEASE_LOCK("a")
1
1
delete from t
2
;
delete from t
4
;
insert into t
2
values (1,1), (2,2);
insert into t
4
values (1,1), (2,2);
reset master;
reset master;
select get_lock("a", 20);
select get_lock("a", 20);
get_lock("a", 20)
get_lock("a", 20)
1
1
delete from t2 where a=1 or a=bug27563(2) order by a;
set @b= 0;
delete from t4 where b=bug27563(1) or b=bug27563(2);
kill query ID;
kill query ID;
ERROR 70100: Query execution was interrupted
select count(*) from t4 /* must be 1 */;
select * from t2 /* must be (1,2), (2,2) */;
count(*)
a b
1
1 1
select @b /* must be 1 at the end of a stmt calling bug27563() */;
2 2
@b
must have the update event more to FD
1
must have the delete query event more to FD
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # User var # # @`b`=0
master-bin.000001 # Query # # use `test`; delete from t4 where b=bug27563(1) or b=bug27563(2)
select
select
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
is not null;
is not null;
...
@@ -114,6 +122,7 @@ select 0 /* must return 0 to mean the killed query is in */;
...
@@ -114,6 +122,7 @@ select 0 /* must return 0 to mean the killed query is in */;
select RELEASE_LOCK("a");
select RELEASE_LOCK("a");
RELEASE_LOCK("a")
RELEASE_LOCK("a")
1
1
drop table t4;
drop function bug27563;
drop function bug27563;
drop table t1,t2,t3;
drop table t1,t2,t3;
end of the tests
end of the tests
mysql-test/suite/binlog/t/binlog_killed.test
View file @
4e55c9a1
...
@@ -68,7 +68,6 @@ select @result /* must be zero either way */;
...
@@ -68,7 +68,6 @@ select @result /* must be zero either way */;
delete
from
t1
;
delete
from
t1
;
delete
from
t2
;
delete
from
t2
;
insert
into
t1
values
(
1
,
1
),(
2
,
2
);
insert
into
t1
values
(
1
,
1
),(
2
,
2
);
let
$ID
=
`select connection_id()`
;
#
#
# simple update
# simple update
...
@@ -77,6 +76,7 @@ connection con1;
...
@@ -77,6 +76,7 @@ connection con1;
begin
;
update
t1
set
b
=
11
where
a
=
2
;
begin
;
update
t1
set
b
=
11
where
a
=
2
;
connection
con2
;
connection
con2
;
let
$ID
=
`select connection_id()`
;
send
update
t1
set
b
=
b
+
10
;
send
update
t1
set
b
=
b
+
10
;
connection
con1
;
connection
con1
;
...
@@ -85,9 +85,9 @@ eval kill query $ID;
...
@@ -85,9 +85,9 @@ eval kill query $ID;
rollback
;
rollback
;
connection
con2
;
connection
con2
;
--
error
ER_QUERY_INTERRUPTED
--
error
0
,
ER_QUERY_INTERRUPTED
reap
;
reap
;
select
*
from
t1
/* must be the same as before (1,1),(2,2) */
;
select
*
from
t1
order
by
a
/* must be the same as before (1,1),(2,2) */
;
#
#
# multi update
# multi update
...
@@ -120,6 +120,7 @@ connection con1;
...
@@ -120,6 +120,7 @@ connection con1;
begin
;
delete
from
t1
where
a
=
2
;
begin
;
delete
from
t1
where
a
=
2
;
connection
con2
;
connection
con2
;
let
$ID
=
`select connection_id()`
;
send
delete
from
t1
where
a
=
2
;
send
delete
from
t1
where
a
=
2
;
connection
con1
;
connection
con1
;
...
@@ -128,9 +129,9 @@ eval kill query $ID;
...
@@ -128,9 +129,9 @@ eval kill query $ID;
rollback
;
rollback
;
connection
con2
;
connection
con2
;
--
error
ER_QUERY_INTERRUPTED
--
error
0
,
ER_QUERY_INTERRUPTED
reap
;
reap
;
select
*
from
t1
/* must be the same as before (1,1),(2,2) */
;
select
*
from
t1
order
by
a
/* must be the same as before (1,1),(2,2) */
;
#
#
# multi delete
# multi delete
...
@@ -163,6 +164,7 @@ insert into t4 values (3, 3);
...
@@ -163,6 +164,7 @@ insert into t4 values (3, 3);
begin
;
insert
into
t1
values
(
3
,
3
);
begin
;
insert
into
t1
values
(
3
,
3
);
connection
con2
;
connection
con2
;
let
$ID
=
`select connection_id()`
;
begin
;
begin
;
send
insert
into
t1
select
*
from
t4
for
update
;
send
insert
into
t1
select
*
from
t4
for
update
;
...
@@ -172,7 +174,7 @@ eval kill query $ID;
...
@@ -172,7 +174,7 @@ eval kill query $ID;
rollback
;
rollback
;
connection
con2
;
connection
con2
;
--
error
ER_QUERY_INTERRUPTED
--
error
0
,
ER_QUERY_INTERRUPTED
reap
;
reap
;
rollback
;
rollback
;
select
*
from
t1
/* must be the same as before (1,1),(2,2) */
;
select
*
from
t1
/* must be the same as before (1,1),(2,2) */
;
...
@@ -182,13 +184,17 @@ drop table t4; # cleanup for the sub-case
...
@@ -182,13 +184,17 @@ drop table t4; # cleanup for the sub-case
###
###
## non-ta table case: killing must be recorded in binlog
## non-ta table case: killing must be recorded in binlog
###
###
create
table
t4
(
a
int
,
b
int
)
ENGINE
=
MyISAM
/* for killing update and delete */
;
delimiter
|
;
delimiter
|
;
create
function
bug27563
(
n
int
)
create
function
bug27563
(
n
int
)
RETURNS
int
(
11
)
RETURNS
int
(
11
)
DETERMINISTIC
DETERMINISTIC
begin
begin
if
n
>
1
then
if
@
b
>
0
then
select
get_lock
(
"a"
,
10
)
into
@
a
;
select
get_lock
(
"a"
,
10
)
into
@
a
;
else
set
@
b
=
1
;
end
if
;
end
if
;
return
n
;
return
n
;
end
|
end
|
...
@@ -198,25 +204,27 @@ delimiter ;|
...
@@ -198,25 +204,27 @@ delimiter ;|
# update
# update
#
#
delete
from
t
2
;
delete
from
t
4
;
insert
into
t
2
values
(
1
,
1
),
(
2
,
2
);
insert
into
t
4
values
(
1
,
1
),
(
1
,
1
);
reset
master
;
reset
master
;
connection
con1
;
connection
con1
;
select
get_lock
(
"a"
,
20
);
select
get_lock
(
"a"
,
20
);
connection
con2
;
connection
con2
;
let
$ID
=
`select connection_id()`
;
let
$ID
=
`select connection_id()`
;
send
update
t2
set
b
=
b
+
bug27563
(
b
)
order
by
a
;
set
@
b
=
0
;
send
update
t4
set
b
=
b
+
bug27563
(
b
);
connection
con1
;
connection
con1
;
--
replace_result
$ID
ID
--
replace_result
$ID
ID
eval
kill
query
$ID
;
eval
kill
query
$ID
;
connection
con2
;
connection
con2
;
--
error
ER_QUERY_INTERRUPTED
--
error
0
,
ER_QUERY_INTERRUPTED
reap
;
reap
;
select
*
from
t2
/* must be (1,2), (2,2) */
;
select
*
from
t4
order
by
b
/* must be (1,1), (1,2) */
;
--
echo
must
have
the
update
event
more
to
FD
select
@
b
/* must be 1 at the end of a stmt calling bug27563() */
;
--
echo
must
have
the
update
query
event
more
to
FD
source
include
/
show_binlog_events
.
inc
;
source
include
/
show_binlog_events
.
inc
;
# a proof the query is binlogged with an error
# a proof the query is binlogged with an error
...
@@ -239,25 +247,27 @@ select RELEASE_LOCK("a");
...
@@ -239,25 +247,27 @@ select RELEASE_LOCK("a");
# delete
# delete
#
#
delete
from
t
2
;
delete
from
t
4
;
insert
into
t
2
values
(
1
,
1
),
(
2
,
2
);
insert
into
t
4
values
(
1
,
1
),
(
2
,
2
);
reset
master
;
reset
master
;
connection
con1
;
connection
con1
;
select
get_lock
(
"a"
,
20
);
select
get_lock
(
"a"
,
20
);
connection
con2
;
connection
con2
;
let
$ID
=
`select connection_id()`
;
let
$ID
=
`select connection_id()`
;
send
delete
from
t2
where
a
=
1
or
a
=
bug27563
(
2
)
order
by
a
;
set
@
b
=
0
;
send
delete
from
t4
where
b
=
bug27563
(
1
)
or
b
=
bug27563
(
2
);
connection
con1
;
connection
con1
;
--
replace_result
$ID
ID
--
replace_result
$ID
ID
eval
kill
query
$ID
;
eval
kill
query
$ID
;
connection
con2
;
connection
con2
;
--
error
ER_QUERY_INTERRUPTED
--
error
0
,
ER_QUERY_INTERRUPTED
reap
;
reap
;
select
*
from
t2
/* must be (1,2), (2,2) */
;
select
count
(
*
)
from
t4
/* must be 1 */
;
--
echo
must
have
the
update
event
more
to
FD
select
@
b
/* must be 1 at the end of a stmt calling bug27563() */
;
--
echo
must
have
the
delete
query
event
more
to
FD
source
include
/
show_binlog_events
.
inc
;
source
include
/
show_binlog_events
.
inc
;
# a proof the query is binlogged with an error
# a proof the query is binlogged with an error
...
@@ -276,6 +286,8 @@ connection con1;
...
@@ -276,6 +286,8 @@ connection con1;
select
RELEASE_LOCK
(
"a"
);
select
RELEASE_LOCK
(
"a"
);
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
drop
table
t4
;
#
#
# load data - see simulation tests
# load data - see simulation tests
#
#
...
...
mysql-test/suite/binlog/t/binlog_killed_simulate.test
View file @
4e55c9a1
--
source
include
/
have_debug
.
inc
--
source
include
/
have_binlog_format_mixed_or_statement
.
inc
--
source
include
/
have_binlog_format_mixed_or_statement
.
inc
#
#
# bug#27571 asynchronous setting mysql_$query()'s local error and
# bug#27571 asynchronous setting mysql_$query()'s local error and
...
...
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
View file @
4e55c9a1
...
@@ -615,6 +615,66 @@ c1 c2 c3 c4 c5 c6 c7
...
@@ -615,6 +615,66 @@ c1 c2 c3 c4 c5 c6 c7
1 1.00 Replication Testing Extra Col b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
1 1.00 Replication Testing Extra Col b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
2 2.00 This Test Should work b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
2 2.00 This Test Should work b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
*** Create t14a on slave ***
STOP SLAVE;
RESET SLAVE;
CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='InnoDB';
*** Create t14a on Master ***
CREATE TABLE t14a (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='InnoDB';
RESET MASTER;
*** Start Slave ***
START SLAVE;
*** Master Data Insert ***
set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t14a () VALUES(1,@b1,'Kyle'),
(2,@b1,'JOE'),
(3,@b1,'QA');
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5
1 b1b1b1b1b1b1b1b1 Kyle
2 b1b1b1b1b1b1b1b1 JOE
3 b1b1b1b1b1b1b1b1 QA
*** Select on Slave ****
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5 c6 c7
1 b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
2 b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
3 b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
STOP SLAVE;
RESET SLAVE;
*** Master Drop c5 ***
ALTER TABLE t14a DROP COLUMN c5;
RESET MASTER;
*** Start Slave ***
START SLAVE;
*** Master Data Insert ***
set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t14a () VALUES(4,@b1),
(5,@b1),
(6,@b1);
SELECT * FROM t14a ORDER BY c1;
c1 c4
1 b1b1b1b1b1b1b1b1
2 b1b1b1b1b1b1b1b1
3 b1b1b1b1b1b1b1b1
4 b1b1b1b1b1b1b1b1
5 b1b1b1b1b1b1b1b1
6 b1b1b1b1b1b1b1b1
*** Select on Slave ****
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5 c6 c7
1 b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
2 b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
3 b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
4 b1b1b1b1b1b1b1b1 NULL 1 CURRENT_TIMESTAMP
5 b1b1b1b1b1b1b1b1 NULL 1 CURRENT_TIMESTAMP
6 b1b1b1b1b1b1b1b1 NULL 1 CURRENT_TIMESTAMP
*** connect to master and drop columns ***
*** connect to master and drop columns ***
ALTER TABLE t14 DROP COLUMN c2;
ALTER TABLE t14 DROP COLUMN c2;
ALTER TABLE t14 DROP COLUMN c4;
ALTER TABLE t14 DROP COLUMN c4;
...
...
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
View file @
4e55c9a1
...
@@ -615,6 +615,66 @@ c1 c2 c3 c4 c5 c6 c7
...
@@ -615,6 +615,66 @@ c1 c2 c3 c4 c5 c6 c7
1 1.00 Replication Testing Extra Col b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
1 1.00 Replication Testing Extra Col b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
2 2.00 This Test Should work b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
2 2.00 This Test Should work b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
*** Create t14a on slave ***
STOP SLAVE;
RESET SLAVE;
CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='MyISAM';
*** Create t14a on Master ***
CREATE TABLE t14a (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='MyISAM';
RESET MASTER;
*** Start Slave ***
START SLAVE;
*** Master Data Insert ***
set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t14a () VALUES(1,@b1,'Kyle'),
(2,@b1,'JOE'),
(3,@b1,'QA');
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5
1 b1b1b1b1b1b1b1b1 Kyle
2 b1b1b1b1b1b1b1b1 JOE
3 b1b1b1b1b1b1b1b1 QA
*** Select on Slave ****
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5 c6 c7
1 b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
2 b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
3 b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
STOP SLAVE;
RESET SLAVE;
*** Master Drop c5 ***
ALTER TABLE t14a DROP COLUMN c5;
RESET MASTER;
*** Start Slave ***
START SLAVE;
*** Master Data Insert ***
set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t14a () VALUES(4,@b1),
(5,@b1),
(6,@b1);
SELECT * FROM t14a ORDER BY c1;
c1 c4
1 b1b1b1b1b1b1b1b1
2 b1b1b1b1b1b1b1b1
3 b1b1b1b1b1b1b1b1
4 b1b1b1b1b1b1b1b1
5 b1b1b1b1b1b1b1b1
6 b1b1b1b1b1b1b1b1
*** Select on Slave ****
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5 c6 c7
1 b1b1b1b1b1b1b1b1 Kyle 1 CURRENT_TIMESTAMP
2 b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP
3 b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP
4 b1b1b1b1b1b1b1b1 NULL 1 CURRENT_TIMESTAMP
5 b1b1b1b1b1b1b1b1 NULL 1 CURRENT_TIMESTAMP
6 b1b1b1b1b1b1b1b1 NULL 1 CURRENT_TIMESTAMP
*** connect to master and drop columns ***
*** connect to master and drop columns ***
ALTER TABLE t14 DROP COLUMN c2;
ALTER TABLE t14 DROP COLUMN c2;
ALTER TABLE t14 DROP COLUMN c4;
ALTER TABLE t14 DROP COLUMN c4;
...
...
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
View file @
4e55c9a1
...
@@ -4,6 +4,11 @@ reset master;
...
@@ -4,6 +4,11 @@ reset master;
reset slave;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
start slave;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=STATEMENT;
SET SESSION BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
...
@@ -31,10 +36,17 @@ a b
...
@@ -31,10 +36,17 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=MIXED;
SET SESSION BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
...
@@ -62,10 +74,17 @@ a b
...
@@ -62,10 +74,17 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=ROW;
SET SESSION BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
...
@@ -93,11 +112,18 @@ a b
...
@@ -93,11 +112,18 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=STATEMENT;
SET SESSION BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
...
@@ -125,10 +151,17 @@ a b
...
@@ -125,10 +151,17 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=MIXED;
SET SESSION BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
...
@@ -156,10 +189,17 @@ a b
...
@@ -156,10 +189,17 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=ROW;
SET SESSION BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
...
@@ -188,9 +228,11 @@ a b
...
@@ -188,9 +228,11 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
View file @
4e55c9a1
...
@@ -4,6 +4,11 @@ reset master;
...
@@ -4,6 +4,11 @@ reset master;
reset slave;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
start slave;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=STATEMENT;
SET SESSION BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
...
@@ -31,12 +36,19 @@ a b
...
@@ -31,12 +36,19 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=MIXED;
SET SESSION BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
...
@@ -64,12 +76,19 @@ a b
...
@@ -64,12 +76,19 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=ROW;
SET SESSION BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
...
@@ -97,6 +116,7 @@ a b
...
@@ -97,6 +116,7 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
...
@@ -104,6 +124,12 @@ master-bin.000001 # Xid # # COMMIT /* XID */
...
@@ -104,6 +124,12 @@ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=STATEMENT;
SET SESSION BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
SET GLOBAL BINLOG_FORMAT=STATEMENT;
...
@@ -131,12 +157,19 @@ a b
...
@@ -131,12 +157,19 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=MIXED;
SET SESSION BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
...
@@ -164,12 +197,19 @@ a b
...
@@ -164,12 +197,19 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Query # # use `test`; DELETE FROM t1
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
STOP SLAVE;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1;
RESET SLAVE;
START SLAVE;
**** On Master ****
**** On Master ****
SET SESSION BINLOG_FORMAT=ROW;
SET SESSION BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
SET GLOBAL BINLOG_FORMAT=ROW;
...
@@ -198,6 +238,7 @@ a b
...
@@ -198,6 +238,7 @@ a b
DROP TABLE t1;
DROP TABLE t1;
show binlog events from <binlog_start>;
show binlog events from <binlog_start>;
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 # Query # # use `test`; DROP TABLE IF EXISTS t1
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
...
@@ -206,3 +247,4 @@ master-bin.000001 # Table_map # # table_id: # (test.t1)
...
@@ -206,3 +247,4 @@ master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; DROP TABLE t1
master-bin.000001 # Query # # use `test`; DROP TABLE t1
RESET MASTER;
mysql-test/suite/rpl/t/rpl_row_until.test
View file @
4e55c9a1
...
@@ -13,6 +13,8 @@ save_master_pos;
...
@@ -13,6 +13,8 @@ save_master_pos;
connection
slave
;
connection
slave
;
sync_with_master
;
sync_with_master
;
stop
slave
;
stop
slave
;
# Make sure the slave sql and io thread has stopped
--
source
include
/
wait_for_slave_to_stop
.
inc
connection
master
;
connection
master
;
# create some events on master
# create some events on master
...
@@ -52,6 +54,8 @@ save_master_pos;
...
@@ -52,6 +54,8 @@ save_master_pos;
connection
slave
;
connection
slave
;
sync_with_master
;
sync_with_master
;
stop
slave
;
stop
slave
;
# Make sure the slave sql and io thread has stopped
--
source
include
/
wait_for_slave_to_stop
.
inc
# this should stop immediately as we are already there
# this should stop immediately as we are already there
start
slave
until
master_log_file
=
'master-bin.000001'
,
master_log_pos
=
740
;
start
slave
until
master_log_file
=
'master-bin.000001'
,
master_log_pos
=
740
;
...
...
mysql-test/suite/rpl/t/rpl_stm_until.test
View file @
4e55c9a1
...
@@ -12,6 +12,8 @@ save_master_pos;
...
@@ -12,6 +12,8 @@ save_master_pos;
connection
slave
;
connection
slave
;
sync_with_master
;
sync_with_master
;
stop
slave
;
stop
slave
;
# Make sure the slave sql and io thread has stopped
--
source
include
/
wait_for_slave_to_stop
.
inc
connection
master
;
connection
master
;
# create some events on master
# create some events on master
...
@@ -51,6 +53,8 @@ save_master_pos;
...
@@ -51,6 +53,8 @@ save_master_pos;
connection
slave
;
connection
slave
;
sync_with_master
;
sync_with_master
;
stop
slave
;
stop
slave
;
# Make sure the slave sql and io thread has stopped
--
source
include
/
wait_for_slave_to_stop
.
inc
# this should stop immediately as we are already there
# this should stop immediately as we are already there
start
slave
until
master_log_file
=
'master-bin.000001'
,
master_log_pos
=
776
;
start
slave
until
master_log_file
=
'master-bin.000001'
,
master_log_pos
=
776
;
...
...
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
View file @
4e55c9a1
...
@@ -615,6 +615,66 @@ c1 c2 c3 c4 c5 c6 c7
...
@@ -615,6 +615,66 @@ c1 c2 c3 c4 c5 c6 c7
1 1.00 Replication Testing Extra Col b1b1b1b1b1b1b1b1 Kyle NULL CURRENT_TIMESTAMP
1 1.00 Replication Testing Extra Col b1b1b1b1b1b1b1b1 Kyle NULL CURRENT_TIMESTAMP
2 2.00 This Test Should work b1b1b1b1b1b1b1b1 JOE NULL CURRENT_TIMESTAMP
2 2.00 This Test Should work b1b1b1b1b1b1b1b1 JOE NULL CURRENT_TIMESTAMP
3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA NULL CURRENT_TIMESTAMP
3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA NULL CURRENT_TIMESTAMP
*** Create t14a on slave ***
STOP SLAVE;
RESET SLAVE;
CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5),
c6 INT DEFAULT '1',
c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE='NDB';
*** Create t14a on Master ***
CREATE TABLE t14a (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
) ENGINE='NDB';
RESET MASTER;
*** Start Slave ***
START SLAVE;
*** Master Data Insert ***
set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t14a () VALUES(1,@b1,'Kyle'),
(2,@b1,'JOE'),
(3,@b1,'QA');
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5
1 b1b1b1b1b1b1b1b1 Kyle
2 b1b1b1b1b1b1b1b1 JOE
3 b1b1b1b1b1b1b1b1 QA
*** Select on Slave ****
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5 c6 c7
1 b1b1b1b1b1b1b1b1 Kyle NULL CURRENT_TIMESTAMP
2 b1b1b1b1b1b1b1b1 JOE NULL CURRENT_TIMESTAMP
3 b1b1b1b1b1b1b1b1 QA NULL CURRENT_TIMESTAMP
STOP SLAVE;
RESET SLAVE;
*** Master Drop c5 ***
ALTER TABLE t14a DROP COLUMN c5;
RESET MASTER;
*** Start Slave ***
START SLAVE;
*** Master Data Insert ***
set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t14a () VALUES(4,@b1),
(5,@b1),
(6,@b1);
SELECT * FROM t14a ORDER BY c1;
c1 c4
1 b1b1b1b1b1b1b1b1
2 b1b1b1b1b1b1b1b1
3 b1b1b1b1b1b1b1b1
4 b1b1b1b1b1b1b1b1
5 b1b1b1b1b1b1b1b1
6 b1b1b1b1b1b1b1b1
*** Select on Slave ****
SELECT * FROM t14a ORDER BY c1;
c1 c4 c5 c6 c7
1 b1b1b1b1b1b1b1b1 Kyle NULL CURRENT_TIMESTAMP
2 b1b1b1b1b1b1b1b1 JOE NULL CURRENT_TIMESTAMP
3 b1b1b1b1b1b1b1b1 QA NULL CURRENT_TIMESTAMP
4 b1b1b1b1b1b1b1b1 NULL NULL CURRENT_TIMESTAMP
5 b1b1b1b1b1b1b1b1 NULL NULL CURRENT_TIMESTAMP
6 b1b1b1b1b1b1b1b1 NULL NULL CURRENT_TIMESTAMP
*** connect to master and drop columns ***
*** connect to master and drop columns ***
ALTER TABLE t14 DROP COLUMN c2;
ALTER TABLE t14 DROP COLUMN c2;
ALTER TABLE t14 DROP COLUMN c4;
ALTER TABLE t14 DROP COLUMN c4;
...
...
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