1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h

Browse Source
This commit is contained in:
serg@serg.mylan 2006-05-31 18:37:16 +02:00
parent 543e1d7b11
commit d976a5d558
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/client_priv.h.rej
View File

@ -1,15 +0,0 @@
***************
*** 50,55 ****
OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
#endif
OPT_TRIGGERS,
OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
! OPT_TZ_UTC, OPT_AUTO_CLOSE
};
--- 50,55 ----
OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
#endif
OPT_TRIGGERS,
OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
! OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT
};

5
sql/log_event.h
View File

@ -1635,6 +1635,8 @@ public:
#endif #endif
char *str_to_hex(char *to, const char *from, uint len); char *str_to_hex(char *to, const char *from, uint len);
#ifdef HAVE_ROW_BASED_REPLICATION
/***************************************************************************** /*****************************************************************************
Table map log event class Table map log event class
@ -1643,7 +1645,6 @@ char *str_to_hex(char *to, const char *from, uint len);
identifier (an integer number). identifier (an integer number).
****************************************************************************/ ****************************************************************************/
class Table_map_log_event : public Log_event class Table_map_log_event : public Log_event
{ {
public: public:
@ -1750,6 +1751,7 @@ private:
****************************************************************************/ ****************************************************************************/
class Rows_log_event : public Log_event class Rows_log_event : public Log_event
{ {
public: public:
@ -2121,5 +2123,6 @@ private:
#endif #endif
}; };
#endif /* HAVE_ROW_BASED_REPLICATION */
#endif /* _log_event_h */ #endif /* _log_event_h */