Skip to content

Commit 884b9ba

Browse files
committed
Bug#35092279 Use of push_warning_printf with severity level SL_ERROR
push_warning / push_warning_printf do not accept ERROR severity in messages since these are usually logged through other means and are not presented to the user through the WARNINGS stack. If called thus then it reduces the severity to WARNING before pushing and logging. On DEBUG builds, however, it crashes with a failed assert. This commit changes all ndbcluster handler calls to push_warning_printf to severity WARNING and, additionally, leverages the var args of string formats present in the function already. Change-Id: Iffdb605c7d7b8c7158a451b02df655b561e6e4ad
1 parent 9497df3 commit 884b9ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sql/ha_ndbcluster.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ check_completed_operations_pre_commit(Thd_ndb *thd_ndb, NdbTransaction *trans,
11091109
my_snprintf(msg, sizeof(msg), "Executing extra operations for "
11101110
"conflict handling hit Ndb error %d '%s'",
11111111
nonMaskedError.code, nonMaskedError.message);
1112-
push_warning_printf(current_thd, Sql_condition::SL_ERROR,
1112+
push_warning_printf(current_thd, Sql_condition::SL_WARNING,
11131113
ER_EXCEPTIONS_WRITE_ERROR,
11141114
ER(ER_EXCEPTIONS_WRITE_ERROR), msg);
11151115
/* Slave will stop replication. */

0 commit comments

Comments
 (0)