diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
| commit | 93ac7ae70ff000353538f732899b421a3f2ea7ce (patch) | |
| tree | 819b5ca057d80b42699de219c982b7924857c406 /sql/log_event.h | |
| parent | 4932aba921755cfbc351b92c67068a5c48d3922b (diff) | |
| parent | a40de1bdeb218d66d5cc737758a4bab1b06f255d (diff) | |
| download | mariadb-git-93ac7ae70ff000353538f732899b421a3f2ea7ce.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 38a40c90799..339db756aab 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -866,6 +866,7 @@ typedef struct st_print_event_info bool allow_parallel_printed; bool found_row_event; bool print_row_count; + static const uint max_delimiter_size= 16; /* Settings on how to print the events */ bool short_form; /* @@ -1264,7 +1265,7 @@ public: bool print_header(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info, bool is_more); bool print_base64(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info, - bool is_more); + bool do_print_encoded); #endif /* MYSQL_SERVER */ /* The following code used for Flashback */ @@ -4333,7 +4334,7 @@ public: int rewrite_db(const char* new_name, size_t new_name_len, const Format_description_log_event*); #endif - ulong get_table_id() const { return m_table_id; } + ulonglong get_table_id() const { return m_table_id; } const char *get_table_name() const { return m_tblnam; } const char *get_db_name() const { return m_dbnam; } @@ -4377,7 +4378,7 @@ private: uchar *m_coltype; uchar *m_memory; - ulong m_table_id; + ulonglong m_table_id; flag_set m_flags; size_t m_data_size; @@ -4506,7 +4507,7 @@ public: MY_BITMAP const *get_cols() const { return &m_cols; } MY_BITMAP const *get_cols_ai() const { return &m_cols_ai; } size_t get_width() const { return m_width; } - ulong get_table_id() const { return m_table_id; } + ulonglong get_table_id() const { return m_table_id; } #if defined(MYSQL_SERVER) /* @@ -4607,7 +4608,7 @@ protected: #ifdef MYSQL_SERVER TABLE *m_table; /* The table the rows belong to */ #endif - ulong m_table_id; /* Table ID */ + ulonglong m_table_id; /* Table ID */ MY_BITMAP m_cols; /* Bitmap denoting columns available */ ulong m_width; /* The width of the columns bitmap */ /* @@ -5171,6 +5172,19 @@ public: virtual int get_data_size() { return IGNORABLE_HEADER_LEN; } }; +#ifdef MYSQL_CLIENT +bool copy_cache_to_string_wrapped(IO_CACHE *body, + LEX_STRING *to, + bool do_wrap, + const char *delimiter, + bool is_verbose); +bool copy_cache_to_file_wrapped(IO_CACHE *body, + FILE *file, + bool do_wrap, + const char *delimiter, + bool is_verbose); +#endif + #ifdef MYSQL_SERVER /***************************************************************************** |