diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 22:10:50 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 22:10:50 +0200 |
commit | f66d1850ac30922eaa49c0131d89efc8357155ff (patch) | |
tree | cb69c43694146bb7993078e76e203ded4ca48a5e /storage/innobase/handler/ha_innodb.cc | |
parent | 772c5f3c78fcdaea2169ba435bac8d851c7945c7 (diff) | |
parent | 1135244a647e423f6a7b2122ad9c305253039399 (diff) | |
download | mariadb-git-f66d1850ac30922eaa49c0131d89efc8357155ff.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
-rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 1f73e048ff1..88ea6f5e642 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -20894,7 +20894,6 @@ ib_senderrf( ...) /*!< Args */ { va_list args; - char* str = NULL; const char* format = my_get_err_msg(code); /* If the caller wants to push a message to the client then @@ -20907,7 +20906,7 @@ ib_senderrf( va_start(args, code); - myf l = Sql_condition::WARN_LEVEL_NOTE; + myf l; switch (level) { case IB_LOG_LEVEL_INFO: @@ -20916,14 +20915,6 @@ ib_senderrf( case IB_LOG_LEVEL_WARN: l = ME_WARNING; break; - case IB_LOG_LEVEL_ERROR: - sd_notifyf(0, "STATUS=InnoDB: Error: %s", str); - l = 0; - break; - case IB_LOG_LEVEL_FATAL: - l = 0; - sd_notifyf(0, "STATUS=InnoDB: Fatal: %s", str); - break; default: l = 0; break; @@ -20932,7 +20923,6 @@ ib_senderrf( my_printv_error(code, format, MYF(l), args); va_end(args); - free(str); if (level == IB_LOG_LEVEL_FATAL) { ut_error; |