From ba919bd168a31658c38a8516324c4405daa81b77 Mon Sep 17 00:00:00 2001
From: "SergeyV@selena." <>
Date: Mon, 24 Oct 2005 20:08:56 +0400
Subject: [PATCH 1/2] Fixes bug #14137. Converts charsets_dir path to
 underlying system representation.

---
 sql/mysqld.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e51eb481767..a0a5864ebee 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7155,6 +7155,7 @@ static void fix_paths(void)
 	     CHARSET_DIR, NullS);
   }
   (void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);
+  convert_dirname(mysql_charsets_dir,mysql_charsets_dir,NullS);
   charsets_dir=mysql_charsets_dir;
 
   if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))

From 14e90138e53a3423ac3474cfb822a3f14bf4325e Mon Sep 17 00:00:00 2001
From: "SergeyV@selena." <>
Date: Wed, 26 Oct 2005 17:45:30 +0400
Subject: [PATCH 2/2] Formatting change for #14137 patch.

---
 sql/mysqld.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a0a5864ebee..94d3c4c332c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7155,7 +7155,7 @@ static void fix_paths(void)
 	     CHARSET_DIR, NullS);
   }
   (void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);
-  convert_dirname(mysql_charsets_dir,mysql_charsets_dir,NullS);
+  convert_dirname(mysql_charsets_dir, mysql_charsets_dir, NullS);
   charsets_dir=mysql_charsets_dir;
 
   if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))