diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2013-12-10 22:11:42 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2013-12-10 22:11:42 -0500 |
| commit | 48e83ba6f79a042022c1949772e999ddb4fd10c4 (patch) | |
| tree | 49300d96fda0237a1d2b37e61286a3fae2df61ff /sql/wsrep_mysqld.h | |
| parent | e1ed3dcebf649a540a8a5fd6293ef1494757fb38 (diff) | |
| download | mariadb-git-48e83ba6f79a042022c1949772e999ddb4fd10c4.tar.gz | |
* Updated auto_increment_xxx_func.result to reflect the changes
made by https://bugs.launchpad.net/codership-mysql/+bug/587170
* Fix for some compiler errors/warnings.
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 37e72123c59..619711cc4b0 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -285,7 +285,7 @@ extern wsrep_seqno_t wsrep_locked_seqno; WSREP_LOG(sql_print_information, "cluster conflict due to %s for threads:",\ (bf_abort) ? "high priority abort" : "certification failure" \ ); \ - if (bf_thd) WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread"); \ + if (bf_thd != NULL) WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread"); \ if (victim_thd) WSREP_LOG_CONFLICT_THD(victim_thd, "Victim thread"); \ } |