From 6230c2e2967a501ebfa958f2ea6c738875a41d82 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@mysql.com>
Date: Wed, 17 Feb 2010 04:14:09 +0100
Subject: [PATCH] Fix test that did not work in out-of-source build . There are
 2 different share directories, one if builddir/share (with compiled
 errmsg.sys) and another one is $sourcedir/share and contains some
 /charsets/*.xml files. second one should be refered to  as MYSQL_CHARSETSDIR
 and  MYSQL_SHAREDIR  $builddir/share

---
 .../suite/sys_vars/r/character_sets_dir_basic.result   | 10 +++++-----
 .../suite/sys_vars/t/character_sets_dir_basic.test     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result b/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
index 0ee774c1e9..c04e5dac19 100644
--- a/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
@@ -1,20 +1,20 @@
 select @@global.character_sets_dir;
 @@global.character_sets_dir
-MYSQL_SHAREDIR/charsets/
+MYSQL_CHARSETSDIR/
 select @@session.character_sets_dir;
 ERROR HY000: Variable 'character_sets_dir' is a GLOBAL variable
 show global variables like 'character_sets_dir';
 Variable_name	Value
-character_sets_dir	MYSQL_SHAREDIR/charsets/
+character_sets_dir	MYSQL_CHARSETSDIR/
 show session variables like 'character_sets_dir';
 Variable_name	Value
-character_sets_dir	MYSQL_SHAREDIR/charsets/
+character_sets_dir	MYSQL_CHARSETSDIR/
 select * from information_schema.global_variables where variable_name='character_sets_dir';
 VARIABLE_NAME	VARIABLE_VALUE
-CHARACTER_SETS_DIR	MYSQL_SHAREDIR/charsets/
+CHARACTER_SETS_DIR	MYSQL_CHARSETSDIR/
 select * from information_schema.session_variables where variable_name='character_sets_dir';
 VARIABLE_NAME	VARIABLE_VALUE
-CHARACTER_SETS_DIR	MYSQL_SHAREDIR/charsets/
+CHARACTER_SETS_DIR	MYSQL_CHARSETSDIR/
 set global character_sets_dir="foo";
 ERROR HY000: Variable 'character_sets_dir' is a read only variable
 set session character_sets_dir="foo";
diff --git a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
index 30befb5b0f..3d9de96153 100644
--- a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
+++ b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
@@ -1,17 +1,17 @@
 #
 # show the global and session values;
 #
---replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
 select @@global.character_sets_dir;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.character_sets_dir;
---replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
 show global variables like 'character_sets_dir';
---replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
 show session variables like 'character_sets_dir';
---replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
 select * from information_schema.global_variables where variable_name='character_sets_dir';
---replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
 select * from information_schema.session_variables where variable_name='character_sets_dir';
 
 #
-- 
2.30.9