diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-07-14 15:06:04 +0500 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-07-14 15:06:04 +0500 |
| commit | cc541211c8232ff41386f99cebc446da1a06cacf (patch) | |
| tree | 74e564b644c182b72bd6b9ad0cc93ae70454e898 /sql/log_event.h | |
| parent | 880743284eb250e1e1a33b1d3705443741b9cca2 (diff) | |
| parent | f9025ea331802d0427b46235d5ddf15b7ee4e795 (diff) | |
| download | mariadb-git-cc541211c8232ff41386f99cebc446da1a06cacf.tar.gz | |
Merge 5.1-bugteam -> 5.1-innodb_plugin.
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index bda53da8ab0..8202dddcc76 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -676,6 +676,7 @@ typedef struct st_print_event_info #ifdef MYSQL_CLIENT uint verbose; table_mapping m_table_map; + table_mapping m_table_map_ignored; #endif /* @@ -1623,8 +1624,7 @@ public: #ifndef MYSQL_CLIENT Query_log_event(THD* thd_arg, const char* query_arg, ulong query_length, - bool using_trans, bool suppress_use, - THD::killed_state killed_err_arg= THD::KILLED_NO_VALUE); + bool using_trans, bool suppress_use, int error); const char* get_db() { return db; } #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); @@ -2875,8 +2875,7 @@ public: uint fn_pos_end_arg, enum_load_dup_handling dup_handling_arg, bool using_trans, bool suppress_use, - THD::killed_state - killed_err_arg= THD::KILLED_NO_VALUE); + int errcode); #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); #endif /* HAVE_REPLICATION */ |