summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2013-11-11 22:47:04 +0200
committerunknown <sanja@montyprogram.com>2013-11-11 22:47:04 +0200
commit3a75900b91ffb4d49396d8f83e0b55b392e83a2a (patch)
treee21a66a326a380ae8d56859ed4f06a16fce20d92 /client
parent8f0be1ad7c2f13a7fd96889bde3402e9a723fc33 (diff)
parentdfed447888e1ab71ec0c80b61459bde6ee6eaf66 (diff)
downloadmariadb-git-3a75900b91ffb4d49396d8f83e0b55b392e83a2a.tar.gz
merge 5.5->10.0-base
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 6e3c8d1eab3..d040cbc210d 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -3041,6 +3041,10 @@ void open_file(const char *name)
5.try in basedir
*/
+#ifdef __WIN__
+ fix_win_paths(curname, sizeof(curname));
+#endif
+
bool in_overlay= opt_overlay_dir &&
!strncmp(curname, opt_overlay_dir, overlay_dir_len);
bool in_suiteir= opt_overlay_dir && !in_overlay &&