diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-28 13:56:08 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-28 13:56:08 -0500 |
commit | c3a2394641e2f7b199977bcf699ad64c1bb1367f (patch) | |
tree | f8867141b6f645065820a14eb74562778ca8d0e4 /sql/wsrep_mysqld.cc | |
parent | ae6e1548cbda6cb1509f84edb57786c9520a7a6e (diff) | |
download | mariadb-git-c3a2394641e2f7b199977bcf699ad64c1bb1367f.tar.gz |
* Merged revisions 3945, 3946..3950, 3951..3961
from codership-mysql/5.5.
* Merged changes in innobase to xtradb.
* Updated WSREP_PATCH_REVNO.
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 708409a40f9..5867b063426 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -126,7 +126,7 @@ static void wsrep_log_cb(wsrep_log_level_t level, const char *msg) { sql_print_error("WSREP: %s", msg); break; case WSREP_LOG_DEBUG: - if (wsrep_debug) sql_print_information ("[Debug] WSREP: %s", msg); + sql_print_information ("[Debug] WSREP: %s", msg); default: break; } |