Merge mysql.com:/home/jimw/my/mysql-5.0-7955

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/bdb.result:
  Resolve conflict
mysql-test/t/bdb.test:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict

1 files changed, 15 insertions, 3 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 75c36176f91..0961f6d4325 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -334,19 +334,31 @@ class sys_var_thd_enum :public sys_var_thd
 protected:
   ulong SV::*offset;
   TYPELIB *enum_names;
+  sys_check_func check_func;
 public:
   sys_var_thd_enum(const char *name_arg, ulong SV::*offset_arg,
 		   TYPELIB *typelib)
-    :sys_var_thd(name_arg), offset(offset_arg), enum_names(typelib)
+    :sys_var_thd(name_arg), offset(offset_arg), enum_names(typelib),
+    check_func(0)
   {}
   sys_var_thd_enum(const char *name_arg, ulong SV::*offset_arg,
 		   TYPELIB *typelib,
 		   sys_after_update_func func)
-    :sys_var_thd(name_arg,func), offset(offset_arg), enum_names(typelib)
+    :sys_var_thd(name_arg,func), offset(offset_arg), enum_names(typelib),
+    check_func(0)
+  {}
+  sys_var_thd_enum(const char *name_arg, ulong SV::*offset_arg,
+		   TYPELIB *typelib, sys_after_update_func func,
+                   sys_check_func check)
+    :sys_var_thd(name_arg,func), offset(offset_arg), enum_names(typelib),
+    check_func(check)
   {}
   bool check(THD *thd, set_var *var)
   {
-    return check_enum(thd, var, enum_names);
+    int ret= 0;
+    if (check_func)
+      ret= (*check_func)(thd, var);
+    return ret ? ret : check_enum(thd, var, enum_names);
   }
   bool update(THD *thd, set_var *var);
   void set_default(THD *thd, enum_var_type type);