diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-09 14:54:57 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-09 14:54:57 -0500 |
| commit | 31eaa90a6ef767b4f846bfe454892979200003a1 (patch) | |
| tree | ac63b8be86cc6d9bfc148407fc5631bd342741c8 /sql/sql_trigger.cc | |
| parent | 088c069462d4a5cf26e97690e045fc3e737453a3 (diff) | |
| download | mariadb-git-31eaa90a6ef767b4f846bfe454892979200003a1.tar.gz | |
Merging revision 3839..3932 from codership-mysql/5.5.
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 46f8100d9d1..da03e5f7a03 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -2453,7 +2453,7 @@ bool load_table_name_for_trigger(THD *thd, DBUG_RETURN(FALSE); } #ifdef WITH_WSREP -int wsrep_create_trigger_query(THD *thd, uchar** buf, uint* buf_len) +int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len) { LEX *lex= thd->lex; String stmt_query; @@ -2501,6 +2501,6 @@ int wsrep_create_trigger_query(THD *thd, uchar** buf, uint* buf_len) stmt_query.append(stmt_definition.str, stmt_definition.length); return wsrep_to_buf_helper(thd, stmt_query.c_ptr(), stmt_query.length(), - buf, buf_len); + buf, buf_len); } #endif /* WITH_WSREP */ |