Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt

1 files changed, 16 insertions, 0 deletions

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 457660d0de9..47cd96b90b7 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -796,6 +796,22 @@ ERROR HY000: Variable 'hostname' is a read only variable
 show variables like 'hostname';
 Variable_name	Value
 hostname	#
+SHOW VARIABLES LIKE 'log';
+Variable_name	Value
+log	ON
+SELECT @@log;
+@@log
+1
+SET GLOBAL log=0;
+ERROR HY000: Variable 'log' is a read only variable
+SHOW VARIABLES LIKE 'log_slow_queries';
+Variable_name	Value
+log_slow_queries	ON
+SELECT @@log_slow_queries;
+@@log_slow_queries
+1
+SET GLOBAL log_slow_queries=0;
+ERROR HY000: Variable 'log_slow_queries' is a read only variable
 End of 5.0 tests
 set global binlog_cache_size         =@my_binlog_cache_size;
 set global connect_timeout           =@my_connect_timeout;