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
8aac108d
Commit
8aac108d
authored
Feb 20, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
fails with --vardir option.
parent
34d8c572
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
mysql-test/r/mix_innodb_myisam_binlog.result
mysql-test/r/mix_innodb_myisam_binlog.result
+2
-2
mysql-test/t/mix_innodb_myisam_binlog.test
mysql-test/t/mix_innodb_myisam_binlog.test
+3
-3
No files found.
mysql-test/r/mix_innodb_myisam_binlog.result
View file @
8aac108d
...
@@ -269,9 +269,9 @@ select get_lock("a",10);
...
@@ -269,9 +269,9 @@ select get_lock("a",10);
get_lock("a",10)
get_lock("a",10)
1
1
select
select
(@a:=load_file("MYSQL
_TEST_DIR/var
/tmp/mix_innodb_myisam_binlog.output"))
(@a:=load_file("MYSQL
TEST_VARDIR
/tmp/mix_innodb_myisam_binlog.output"))
is not null;
is not null;
(@a:=load_file("MYSQL
_TEST_DIR/var
/tmp/mix_innodb_myisam_binlog.output"))
(@a:=load_file("MYSQL
TEST_VARDIR
/tmp/mix_innodb_myisam_binlog.output"))
is not null
is not null
1
1
select
select
...
...
mysql-test/t/mix_innodb_myisam_binlog.test
View file @
8aac108d
...
@@ -283,10 +283,10 @@ select get_lock("a",10); # wait for rollback to finish
...
@@ -283,10 +283,10 @@ select get_lock("a",10); # wait for rollback to finish
# we check that the error code of the "ROLLBACK" event is 0 and not
# we check that the error code of the "ROLLBACK" event is 0 and not
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
# and does not make slave to stop)
# and does not make slave to stop)
--
exec
$MYSQL_BINLOG
--
start
-
position
=
547
$MYSQL
_TEST_DIR
/
var
/
log
/
master
-
bin
.
000001
>
var
/
tmp
/
mix_innodb_myisam_binlog
.
output
--
exec
$MYSQL_BINLOG
--
start
-
position
=
547
$MYSQL
TEST_VARDIR
/
log
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
mix_innodb_myisam_binlog
.
output
--
replace_result
$MYSQL
_TEST_DIR
MYSQL_TEST_
DIR
--
replace_result
$MYSQL
TEST_VARDIR
MYSQLTEST_VAR
DIR
eval
select
eval
select
(
@
a
:=
load_file
(
"
$MYSQL
_TEST_DIR
/var
/tmp/mix_innodb_myisam_binlog.output"
))
(
@
a
:=
load_file
(
"
$MYSQL
TEST_VARDIR
/tmp/mix_innodb_myisam_binlog.output"
))
is
not
null
;
is
not
null
;
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
eval
select
eval
select
...
...
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