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
6c3921eb
Commit
6c3921eb
authored
May 30, 2007
by
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug#22725
test comments correction
parent
508e17fd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mysql-test/r/binlog_killed.result
mysql-test/r/binlog_killed.result
+1
-1
mysql-test/t/binlog_killed.test
mysql-test/t/binlog_killed.test
+3
-3
No files found.
mysql-test/r/binlog_killed.result
View file @
6c3921eb
...
@@ -5,7 +5,7 @@ select get_lock("a", 20);
...
@@ -5,7 +5,7 @@ select get_lock("a", 20);
get_lock("a", 20)
get_lock("a", 20)
1
1
reset master;
reset master;
insert into t2 values (null, null), (null, get_lock("a", 10))
,(null, get_lock("a", 10))
;
insert into t2 values (null, null), (null, get_lock("a", 10));
select @result /* must be zero either way */;
select @result /* must be zero either way */;
@result
@result
0
0
...
...
mysql-test/t/binlog_killed.test
View file @
6c3921eb
...
@@ -22,7 +22,7 @@ select get_lock("a", 20);
...
@@ -22,7 +22,7 @@ select get_lock("a", 20);
connection
con2
;
connection
con2
;
let
$ID
=
`select connection_id()`
;
let
$ID
=
`select connection_id()`
;
reset
master
;
reset
master
;
send
insert
into
t2
values
(
null
,
null
),
(
null
,
get_lock
(
"a"
,
10
))
,(
null
,
get_lock
(
"a"
,
10
))
;
send
insert
into
t2
values
(
null
,
null
),
(
null
,
get_lock
(
"a"
,
10
));
connection
con1
;
connection
con1
;
...
@@ -36,7 +36,7 @@ eval kill query $ID;
...
@@ -36,7 +36,7 @@ eval kill query $ID;
connection
con2
;
connection
con2
;
--
error
0
,
ER_QUERY_INTERRUPTED
--
error
0
,
ER_QUERY_INTERRUPTED
reap
;
reap
;
let
$rows
=
`select count(*) from t2 /* must be
1
or 0 */`
;
let
$rows
=
`select count(*) from t2 /* must be
2
or 0 */`
;
--
exec
$MYSQL_BINLOG
--
start
-
position
=
126
$MYSQLTEST_VARDIR
/
log
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
kill_query_calling_sp
.
binlog
--
exec
$MYSQL_BINLOG
--
start
-
position
=
126
$MYSQLTEST_VARDIR
/
log
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
kill_query_calling_sp
.
binlog
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
...
@@ -46,7 +46,7 @@ is not null;
...
@@ -46,7 +46,7 @@ is not null;
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
let
$error_code
=
`select @a like "%#%error_code=0%" /* must return 1 or 0*/`
;
let
$error_code
=
`select @a like "%#%error_code=0%" /* must return 1 or 0*/`
;
let
$insert_binlogged
=
`select @a like "%insert into%" /* must return 1 or 0 */`
;
let
$insert_binlogged
=
`select @a like "%insert into%" /* must return 1 or 0 */`
;
eval
set
@
result
=
$rows
-
2
*
$error_code
-
$insert_binlogged
;
eval
set
@
result
=
$rows
-
$error_code
-
$insert_binlogged
;
enable_abort_on_error
;
enable_abort_on_error
;
enable_query_log
;
enable_query_log
;
...
...
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