diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
| commit | 96089e2b3a013c83e812672284bf10a34ba9d11c (patch) | |
| tree | 937beb6f27e5e7958081a4a5ba13ceb2f5251396 /sql/log_event.h | |
| parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
| parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
| download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz | |
resolving conflicts
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 7ba203e7f30..c5ff3ffd4da 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -212,8 +212,10 @@ struct sql_ex_info #define BINLOG_MAGIC "\xfe\x62\x69\x6e" -#define LOG_EVENT_TIME_F 0x1 -#define LOG_EVENT_FORCED_ROTATE_F 0x2 +#define LOG_EVENT_TIME_F 0x1 +#define LOG_EVENT_FORCED_ROTATE_F 0x2 +#define LOG_EVENT_THREAD_SPECIFIC_F 0x4 /* query depends on thread + (for example: TEMPORARY TABLE) */ enum Log_event_type { @@ -466,9 +468,10 @@ public: void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli) { - return exec_event(thd->slave_net,rli); + return exec_event(thd->slave_net,rli,0); } - int exec_event(NET* net, struct st_relay_log_info* rli); + int exec_event(NET* net, struct st_relay_log_info* rli, + bool use_rli_only_for_errors); #endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); |