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

4 files changed, 19 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
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index b6059ac00e3..9e8a7a1b56f 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -387,3 +387,11 @@ select a into @x from t1;
 show warnings;
 drop table t1;
 
+#
+# Bug #10339: read only variables.
+#
+
+--error 1238
+set @@warning_count=1;
+--error 1238
+set @@global.error_count=1;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 9e26a1f2626..b8059779a2a 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2954,6 +2954,11 @@ bool not_all_support_one_shot(List<set_var_base> *var_list)
 
 int set_var::check(THD *thd)
 {
+  if (var->is_readonly())
+  {
+    my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name, "read only");
+    return -1;
+  }
   if (var->check_type(type))
   {
     int err= type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE;
diff --git a/sql/set_var.h b/sql/set_var.h
index 32f45187124..37522a0b753 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -75,6 +75,7 @@ public:
   { return option_limits == 0; }
   Item *item(THD *thd, enum_var_type type, LEX_STRING *base);
   virtual bool is_struct() { return 0; }
+  virtual bool is_readonly() const { return 0; }
 };
 
 
@@ -699,6 +700,7 @@ public:
     return (*value_ptr_func)(thd);
   }
   SHOW_TYPE type() { return show_type; }
+  bool is_readonly() const { return 1; }
 };
 
 class sys_var_thd_time_zone :public sys_var_thd