mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-18 06:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix for overlayed include files on Windows and a test case

Browse source
This commit is contained in:
Elena Stepanova 2013-11-10 14:37:32 +04:00
commit 700397a8e2
6 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/mysqltest.cc
View file

@ -2992,6 +2992,9 @@ void open_file(const char *name)
char buff[FN_REFLEN]; char buff[FN_REFLEN];
size_t length; size_t length;
const char *curname= cur_file->file_name; const char *curname= cur_file->file_name;
#ifdef __WIN__
fix_win_paths(curname, sizeof(curname));
#endif
DBUG_ENTER("open_file"); DBUG_ENTER("open_file");
DBUG_PRINT("enter", ("name: %s", name)); DBUG_PRINT("enter", ("name: %s", name));

2
mysql-test/suite/mtr2/overlay.inc Normal file
View file

@ -0,0 +1,2 @@
select 2;

3
mysql-test/suite/mtr2/single.result
View file

@ -1,3 +1,6 @@
select 1; select 1;
1 1
1 1
select 2;
2
2

4
mysql-test/suite/mtr2/single.test
View file

@ -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;

2
storage/myisam/mysql-test/mtr2/overlay.inc Normal file
View file

@ -0,0 +1,2 @@
select 3;

12
storage/myisam/mysql-test/mtr2/single.rdiff Normal file
View file

@ -0,0 +1,12 @@
--- 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