database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix test that did not work in out-of-source build .

Browse Source 
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
This commit is contained in:
Vladislav Vaintroub
2010-02-17 04:14:09 +01:00
parent b2eebd9966
commit 57f4097346
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
View File

@ -1,20 +1,20 @@
select @@global.character_sets_dir; select @@global.character_sets_dir;
@@global.character_sets_dir @@global.character_sets_dir
MYSQL_SHAREDIR/charsets/ MYSQL_CHARSETSDIR/
select @@session.character_sets_dir; select @@session.character_sets_dir;
ERROR HY000: Variable 'character_sets_dir' is a GLOBAL variable ERROR HY000: Variable 'character_sets_dir' is a GLOBAL variable
show global variables like 'character_sets_dir'; show global variables like 'character_sets_dir';
Variable_name Value Variable_name Value
character_sets_dir MYSQL_SHAREDIR/charsets/ character_sets_dir MYSQL_CHARSETSDIR/
show session variables like 'character_sets_dir'; show session variables like 'character_sets_dir';
Variable_name Value 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'; select * from information_schema.global_variables where variable_name='character_sets_dir';
VARIABLE_NAME VARIABLE_VALUE 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'; select * from information_schema.session_variables where variable_name='character_sets_dir';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
CHARACTER_SETS_DIR MYSQL_SHAREDIR/charsets/ CHARACTER_SETS_DIR MYSQL_CHARSETSDIR/
set global character_sets_dir="foo"; set global character_sets_dir="foo";
ERROR HY000: Variable 'character_sets_dir' is a read only variable ERROR HY000: Variable 'character_sets_dir' is a read only variable
set session character_sets_dir="foo"; set session character_sets_dir="foo";

10
mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
View File

@ -1,17 +1,17 @@
# #
# show the global and session values; # show the global and session values;
# #
--replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR --replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
select @@global.character_sets_dir; select @@global.character_sets_dir;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.character_sets_dir; select @@session.character_sets_dir;
--replace_result $MYSQL_SHAREDIR MYSQL_SHAREDIR --replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
show global variables like 'character_sets_dir'; 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'; 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'; 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'; select * from information_schema.session_variables where variable_name='character_sets_dir';
# #