diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-25 10:42:05 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-25 10:42:05 +0300 |
| commit | 745239fd29d88ead433dddf39e4b369776efe62b (patch) | |
| tree | 9004d36cbc7a71bdf1b8e30f6df8adfba7941dec /sql/handler.cc | |
| parent | 9c85ced30dc4f6d28b4fe7ad1b73ca76f3c43a44 (diff) | |
| download | mariadb-git-745239fd29d88ead433dddf39e4b369776efe62b.tar.gz | |
After merge fixes
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index dd297740c7d..11ad582a2ff 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1506,17 +1506,6 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans) int error= 0; Ha_trx_info *ha_info= trans->ha_list, *ha_info_next; DBUG_ENTER("commit_one_phase_2"); -#ifdef WITH_WSREP -#ifdef WSREP_PROC_INFO - char info[64]= { 0, }; - snprintf (info, sizeof(info) - 1, "ha_commit_one_phase(%lld)", - (long long)thd->wsrep_trx_seqno); -#else - const char info[]="ha_commit_one_phase()"; -#endif /* WSREP_PROC_INFO */ - char* tmp_info= NULL; - if (WSREP(thd)) tmp_info= (char *)thd_proc_info(thd, info); -#endif /* WITH_WSREP */ if (ha_info) { @@ -1551,9 +1540,6 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans) #else thd->transaction.cleanup(); #endif /* WITH_WSREP */ -#ifdef WITH_WSREP - if (WSREP(thd)) thd_proc_info(thd, tmp_info); -#endif /* WITH_WSREP */ DBUG_RETURN(error); } |