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
668a5a4a
Commit
668a5a4a
authored
Nov 11, 2013
by
Elena Stepanova
Browse files
Options
Browse Files
Download
Plain Diff
MDEV-5272 MTR/mysqltest overlays for included files do not work on Windows
parents
ef43b71f
1f13733b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
0 deletions
+27
-0
client/mysqltest.cc
client/mysqltest.cc
+4
-0
mysql-test/suite/mtr2/overlay.inc
mysql-test/suite/mtr2/overlay.inc
+2
-0
mysql-test/suite/mtr2/single.result
mysql-test/suite/mtr2/single.result
+3
-0
mysql-test/suite/mtr2/single.test
mysql-test/suite/mtr2/single.test
+4
-0
storage/myisam/mysql-test/mtr2/overlay.inc
storage/myisam/mysql-test/mtr2/overlay.inc
+2
-0
storage/myisam/mysql-test/mtr2/single.rdiff
storage/myisam/mysql-test/mtr2/single.rdiff
+12
-0
No files found.
client/mysqltest.cc
View file @
668a5a4a
...
@@ -3034,6 +3034,10 @@ void open_file(const char *name)
...
@@ -3034,6 +3034,10 @@ void open_file(const char *name)
5.try in basedir
5.try in basedir
*/
*/
#ifdef __WIN__
fix_win_paths
(
curname
,
sizeof
(
curname
));
#endif
bool
in_overlay
=
opt_overlay_dir
&&
bool
in_overlay
=
opt_overlay_dir
&&
!
strncmp
(
curname
,
opt_overlay_dir
,
overlay_dir_len
);
!
strncmp
(
curname
,
opt_overlay_dir
,
overlay_dir_len
);
bool
in_suiteir
=
opt_overlay_dir
&&
!
in_overlay
&&
bool
in_suiteir
=
opt_overlay_dir
&&
!
in_overlay
&&
...
...
mysql-test/suite/mtr2/overlay.inc
0 → 100644
View file @
668a5a4a
select
2
;
mysql-test/suite/mtr2/single.result
View file @
668a5a4a
select 1;
select 1;
1
1
1
1
select 2;
2
2
mysql-test/suite/mtr2/single.test
View file @
668a5a4a
...
@@ -5,4 +5,8 @@
...
@@ -5,4 +5,8 @@
# three times - once for the parent suite, and once for each overlay.
# three times - once for the parent suite, and once for each overlay.
# even if the test files are not overlayed.
# even if the test files are not overlayed.
#
#
# overlay.inc is overridden in mtr2-myisam, and there is an rdiff file.
#
select
1
;
select
1
;
source
overlay
.
inc
;
storage/myisam/mysql-test/mtr2/overlay.inc
0 → 100644
View file @
668a5a4a
select
3
;
storage/myisam/mysql-test/mtr2/single.rdiff
0 → 100644
View file @
668a5a4a
--- suite/mtr2/single.result 2013-11-10 03:58:37.000000000 +0400
+++ suite/mtr2/single.reject 2013-11-10 03:59:08.000000000 +0400
@@ -1,6 +1,6 @@
select 1;
1
1
-select 2;
-2
-2
+select 3;
+3
+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