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
090bc57b
Commit
090bc57b
authored
May 24, 2013
by
Venkatesh Duggirala
Browse files
Options
Browse Files
Download
Plain Diff
Bug#16765278 DELETE SQL_LOAD_MB* FILE (TEMP FILE) CREATED
BY BINLOG_KILLED_SIMULATE.TEST Merging fix from mysql-5.1
parents
38751bdd
8ee7751f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
mysql-test/suite/binlog/t/binlog_killed_simulate.test
mysql-test/suite/binlog/t/binlog_killed_simulate.test
+4
-5
No files found.
mysql-test/suite/binlog/t/binlog_killed_simulate.test
View file @
090bc57b
...
@@ -20,9 +20,6 @@ reset master;
...
@@ -20,9 +20,6 @@ reset master;
update
t1
set
a
=
2
/* will be "killed" after work has been done */
;
update
t1
set
a
=
2
/* will be "killed" after work has been done */
;
# a proof the query is binlogged with no error
# a proof the query is binlogged with no error
#todo: introduce a suite private macro that provides numeric values
# for some constants like the offset of the first real event
# that is different between severs versions.
let
$MYSQLD_DATADIR
=
`select @@datadir`
;
let
$MYSQLD_DATADIR
=
`select @@datadir`
;
--
let
$binlog_start_point
=
query_get_value
(
SHOW
BINLOG
EVENTS
LIMIT
1
,
End_log_pos
,
1
)
--
let
$binlog_start_point
=
query_get_value
(
SHOW
BINLOG
EVENTS
LIMIT
1
,
End_log_pos
,
1
)
--
exec
$MYSQL_BINLOG
--
force
-
if
-
open
--
start
-
position
=
$binlog_start_point
$MYSQLD_DATADIR
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
--
exec
$MYSQL_BINLOG
--
force
-
if
-
open
--
start
-
position
=
$binlog_start_point
$MYSQLD_DATADIR
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
...
@@ -48,14 +45,14 @@ reset master;
...
@@ -48,14 +45,14 @@ reset master;
--
error
ER_QUERY_INTERRUPTED
--
error
ER_QUERY_INTERRUPTED
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t2
/* will be "killed" in the middle */
;
load
data
infile
'../../std_data/rpl_loaddata.dat'
into
table
t2
/* will be "killed" in the middle */
;
# a proof the query is binlogged with an error
# a proof the query is binlogged with an error
--
let
$binlog_load_data
=
query_get_value
(
SHOW
BINLOG
EVENTS
,
Pos
,
3
)
--
let
$binlog_load_data
=
query_get_value
(
SHOW
BINLOG
EVENTS
,
Pos
,
3
)
--
let
$binlog_end
=
query_get_value
(
SHOW
BINLOG
EVENTS
,
Pos
,
4
)
--
let
$binlog_end
=
query_get_value
(
SHOW
BINLOG
EVENTS
,
Pos
,
4
)
source
include
/
show_binlog_events
.
inc
;
source
include
/
show_binlog_events
.
inc
;
--
exec
$MYSQL_BINLOG
--
force
-
if
-
open
--
start
-
position
=
$binlog_load_data
--
stop
-
position
=
$binlog_end
$MYSQLD_DATADIR
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
--
mkdir
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
--
exec
$MYSQL_BINLOG
--
local
-
load
=
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
--
force
-
if
-
open
--
start
-
position
=
$binlog_load_data
--
stop
-
position
=
$binlog_end
$MYSQLD_DATADIR
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
eval
select
eval
select
...
@@ -68,6 +65,8 @@ eval select $error_code /* must return 0 to mean the killed query is in */;
...
@@ -68,6 +65,8 @@ eval select $error_code /* must return 0 to mean the killed query is in */;
# cleanup for the sub-case
# cleanup for the sub-case
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
;
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
.
binlog
;
--
remove_files_wildcard
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
*
--
rmdir
$MYSQLTEST_VARDIR
/
tmp
/
binlog_killed_bug27571
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
...
...
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