summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <mats@mysql.com>2006-01-09 16:37:24 +0100
committerunknown <mats@mysql.com>2006-01-09 16:37:24 +0100
commit672ac640483f81b2d9b7c605ae38dae2017ad140 (patch)
treea270ed8e18c0766d889b82fabc3d9794c4791b91
parente8b1464ecce44153ad7ec44cab08cceb1124cb64 (diff)
downloadmariadb-git-672ac640483f81b2d9b7c605ae38dae2017ad140.tar.gz
Changes to support HP-UX.clone-5.1.5-build
sql/log.cc: Preprocessor symbol NO_FLAGS used by system on HP-UX. sql/log_event.h: Preprocessor symbol NO_FLAGS used by system on HP-UX.
-rw-r--r--sql/log.cc2
-rw-r--r--sql/log_event.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc
index dd08ca7b9b5..45ce7776d1a 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2560,7 +2560,7 @@ bool MYSQL_LOG::write_table_map(THD *thd, IO_CACHE *file, TABLE* table,
#endif
Table_map_log_event::flag_set const
- flags= Table_map_log_event::NO_FLAGS;
+ flags= Table_map_log_event::TM_NO_FLAGS;
Table_map_log_event
the_event(thd, table, table->s->table_map_id, is_transactional, flags);
diff --git a/sql/log_event.h b/sql/log_event.h
index 3ddf177a9cf..ab11c064921 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1685,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; }