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

* Updated auto_increment_xxx_func.result to reflect the changes

Browse Source 
made by https://bugs.launchpad.net/codership-mysql/+bug/587170

* Fix for some compiler errors/warnings.
This commit is contained in:
Nirbhay Choubey
2013-12-10 22:11:42 -05:00
parent e1ed3dcebf
commit 48e83ba6f7
8 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/wsrep_mysqld.h
View File

@ -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"); \
}