diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 11:35:19 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 11:35:19 +0300 |
| commit | f222e7d471079cd164d6cc822fce311b67b92ecd (patch) | |
| tree | a834a40945875291c62f9b9c713728db3a9a1949 /sql/wsrep_mysqld.cc | |
| parent | 61bda9a2f0017b1fbe88c63a0ada68ad1024a72c (diff) | |
| download | mariadb-git-f222e7d471079cd164d6cc822fce311b67b92ecd.tar.gz | |
Merge fixes, now at level 3430 in mariadb-galera-5.5
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 14bc3e54845..2b19b07cc2a 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -571,7 +571,7 @@ int wsrep_init() return rcode; } -extern "C" int wsrep_on(void *); +extern int wsrep_on(void *); void wsrep_init_startup (bool first) { @@ -1284,10 +1284,10 @@ void wsrep_to_isolation_end(THD *thd) { msg, \ req->thread_id, (long long)req->wsrep_trx_seqno, \ req->wsrep_exec_mode, req->wsrep_query_state, req->wsrep_conflict_state, \ - req->command, req->lex->sql_command, req->query(), \ + req->get_command(), req->lex->sql_command, req->query(), \ gra->thread_id, (long long)gra->wsrep_trx_seqno, \ gra->wsrep_exec_mode, gra->wsrep_query_state, gra->wsrep_conflict_state, \ - gra->command, gra->lex->sql_command, gra->query()); + gra->get_command(), gra->lex->sql_command, gra->query()); bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx, |