Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs

1 files changed, 5 insertions, 2 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index f4c3867910a..8b665755aab 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1673,8 +1673,11 @@ public:
   {
     /* 
        Nothing here right now, but the flags support is there in
-       preparation for changes that are coming.
+       preparation for changes that are coming.  Need to add a
+       constant to make it compile under HP-UX: aCC does not like
+       empty enumerations.
     */
+    ENUM_FLAG_COUNT
   };
 
   typedef uint16 flag_set;
@@ -1682,7 +1685,7 @@ public:
   /* Special constants representing sets of flags */
   enum 
   {
-    NO_FLAGS = 0U
+    TM_NO_FLAGS = 0U
   };
 
   void set_flags(flag_set flag) { m_flags |= flag; }