database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2006-01-09 17:35:25 -06:00
parent 9570a11832 63a33172e2
commit 08da99aa94
134 changed files with 3040 additions and 3705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log_event.h
View File

@@ -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; }