database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merging revision 3839..3932 from codership-mysql/5.5.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-01-09 14:54:57 -05:00
parent 088c069462
commit 31eaa90a6e
53 changed files with 3238 additions and 2283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_trigger.cc
View File

@ -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 */