Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean

into  hh-nb.hungers:/work/merge/mysql-5.1-build
This commit is contained in:
hhunger@hh-nb.hungers 2008-04-30 15:09:51 +02:00
commit 903e0b4ed5
2 changed files with 2 additions and 3 deletions

View file

@ -4,7 +4,6 @@ COUNT(@@GLOBAL.myisam_use_mmap)
1
1 Expected
'#---------------------BS_STVARS_042_02----------------------#'
SET @@GLOBAL.myisam_use_mmap=1;
"BUG:It should give error on setting this variable as it is readonly variable"
Expected error 'Read only variable'
SELECT COUNT(@@GLOBAL.myisam_use_mmap);
@ -16,7 +15,7 @@ SELECT @@GLOBAL.myisam_use_mmap = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='myisam_use_mmap';
@@GLOBAL.myisam_use_mmap = VARIABLE_VALUE
0
1
1 Expected
SELECT COUNT(@@GLOBAL.myisam_use_mmap);
COUNT(@@GLOBAL.myisam_use_mmap)

View file

@ -39,7 +39,7 @@ SELECT COUNT(@@GLOBAL.myisam_use_mmap);
####################################################################
#--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@GLOBAL.myisam_use_mmap=1;
#SET @@GLOBAL.myisam_use_mmap=1;
--ECHO "BUG:It should give error on setting this variable as it is readonly variable"
--echo Expected error 'Read only variable'