Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0

SergeyV@selena. · SergeyV@selena. · commit 0eacb6fb35bb · 2005-10-26T19:05:02.000+04:00
into  selena.:H:/MYSQL/src/#14137-mysql-5.0
diff --git 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))

Original file line number	Diff line number	Diff line change
`@@ -7155,6 +7155,7 @@ static void fix_paths(void)`
`7155`	`7155`	`CHARSET_DIR, NullS);`
`7156`	`7156`	`}`
`7157`	`7157`	`(void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);`
	`7158`	`+ convert_dirname(mysql_charsets_dir, mysql_charsets_dir, NullS);`
`7158`	`7159`	`charsets_dir=mysql_charsets_dir;`
`7159`	`7160`
`7160`	`7161`	`if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))`