diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
| commit | 16c5c53fc21b162844c38a87ac48205448ca1d2f (patch) | |
| tree | 7a50437d5f9da772ec8aaacab322e5f6c13e7305 /sql/log_event.h | |
| parent | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (diff) | |
| parent | ed418461614d912fbb114053508b3fb09b1fc2f0 (diff) | |
| download | mariadb-git-16c5c53fc21b162844c38a87ac48205448ca1d2f.tar.gz | |
mysql 5.5.23 merge
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 7a153a2d08e..78dccb3cac1 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -4260,7 +4260,7 @@ private: }; #endif -int append_query_string(CHARSET_INFO *csinfo, +int append_query_string(THD *thd, CHARSET_INFO *csinfo, String const *from, String *to); bool rpl_get_position_info(const char **log_file_name, ulonglong *log_pos, |