Commit 7384eddb authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs 

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs


mysql-test/r/variables.result:
  SCCS merged
mysql-test/t/variables.test:
  SCCS merged
parents 08c0ed76 3c9952a1

mysql-test/r/variables.result

+18 −0
Original line number Diff line number Diff line
@@ -566,3 +566,21 @@ set global character_set_system = latin1; 
ERROR HY000: Variable 'character_set_system' is a read only variable

set @@global.version_compile_os='234';

ERROR HY000: Variable 'version_compile_os' is a read only variable

set character_set_filesystem=latin1;

select @@character_set_filesystem;

@@character_set_filesystem

latin1

set @@global.character_set_filesystem=latin2;

set character_set_filesystem=latin1;

select @@character_set_filesystem;

@@character_set_filesystem

latin1

set @@global.character_set_filesystem=latin2;

set character_set_filesystem=default;

select @@character_set_filesystem;

@@character_set_filesystem

latin2

set @@global.character_set_filesystem=default;

select @@global.character_set_filesystem;

@@global.character_set_filesystem

binary

mysql-test/t/variables.test

+14 −0
Original line number Diff line number Diff line
@@ -456,4 +456,18 @@ set global character_set_system = latin1; 
--error 1238

set @@global.version_compile_os='234';



#

# Check character_set_filesystem variable

#

set character_set_filesystem=latin1;

select @@character_set_filesystem;

set @@global.character_set_filesystem=latin2;

set character_set_filesystem=latin1;

select @@character_set_filesystem;

set @@global.character_set_filesystem=latin2;

set character_set_filesystem=default;

select @@character_set_filesystem;

set @@global.character_set_filesystem=default;

select @@global.character_set_filesystem;



# End of 5.0 tests