diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
| commit | 496e22cf3bd2a481fd3502d86e5a4e8228bf9823 (patch) | |
| tree | 80549f8005fcf3236bfa004a5aea35e4e67b36ca /sql/events.cc | |
| parent | 45f484b8381a5923aec9c704e54c7f7bcfa02a40 (diff) | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-496e22cf3bd2a481fd3502d86e5a4e8228bf9823.tar.gz | |
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/events.cc b/sql/events.cc index 73ce894095c..ea62ec4129d 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -1169,7 +1169,7 @@ end: } #ifdef WITH_WSREP -int wsrep_create_event_query(THD *thd, uchar** buf, int* buf_len) +int wsrep_create_event_query(THD *thd, uchar** buf, size_t* buf_len) { String log_query; |