summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-01-24 20:03:10 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-01-24 20:03:10 +0100
commitb4d6a13510dbd5bc2eebdd44e5eaec02d8f3725b (patch)
tree1626adb43ee9a07fc599b570b2f78c9aee961d52 /sql/mysqld.cc
parentc514d75ebb0651dcc65ca9e09cf8458dc904f242 (diff)
downloadmariadb-git-b4d6a13510dbd5bc2eebdd44e5eaec02d8f3725b.tar.gz
Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separators in get_relative_path() on Windows
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 276ec02a042..12bd1ec7c47 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7681,7 +7681,7 @@ static char *get_relative_path(const char *path)
strcmp(DEFAULT_MYSQL_HOME,FN_ROOTDIR))
{
path+=(uint) strlen(DEFAULT_MYSQL_HOME);
- while (*path == FN_LIBCHAR)
+ while (*path == FN_LIBCHAR || *path == FN_LIBCHAR2)
path++;
}
return (char*) path;