resolving conflicts

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/log_event.cc:
  Conflicts resolving
sql/log_event.h:
  conflicts
sql/mysqld.cc:
  conflicts
sql/opt_range.cc:
  conflicts
sql/protocol.cc:
  conflicts
sql/sql_show.cc:
  conflicts

1 files changed, 18 insertions, 0 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 795d9f0d0ab..f9a275941ef 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -212,6 +212,24 @@ public:
 };
 
 
+class sys_var_thd_ha_rows :public sys_var_thd
+{
+public:
+  ha_rows SV::*offset;
+  sys_var_thd_ha_rows(const char *name_arg, ha_rows SV::*offset_arg)
+    :sys_var_thd(name_arg), offset(offset_arg)
+  {}
+  sys_var_thd_ha_rows(const char *name_arg, ha_rows SV::*offset_arg,
+		      sys_after_update_func func)
+    :sys_var_thd(name_arg,func), offset(offset_arg)
+  {}
+  bool update(THD *thd, set_var *var);
+  void set_default(THD *thd, enum_var_type type);
+  SHOW_TYPE type() { return SHOW_HA_ROWS; }
+  byte *value_ptr(THD *thd, enum_var_type type);
+};
+
+
 class sys_var_thd_ulonglong :public sys_var_thd
 {
 public: