summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-05-18 14:46:05 +0500
committerunknown <ramil@mysql.com>2005-05-18 14:46:05 +0500
commit9971175072131d736ede0f8a32b3d3da3436150c (patch)
tree62b43460e475729746b88c94737336fd957ddc1a /mysql-test/r/variables.result
parent0a21bf0c5a39e8f49b4fe39926311f08ef7d10eb (diff)
parent7c1d520ef1a18ad397499de6d70debe5be81dd99 (diff)
downloadmariadb-git-9971175072131d736ede0f8a32b3d3da3436150c.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339 mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/set_var.cc: Auto merged
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 5e9a0e11c24..c7f980df350 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -515,3 +515,7 @@ show warnings;
Level Code Message
Warning 1329 No data to FETCH
drop table t1;
+set @@warning_count=1;
+ERROR HY000: Variable 'warning_count' is a read only variable
+set @@global.error_count=1;
+ERROR HY000: Variable 'error_count' is a read only variable