1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index eab5ec890df..e04c2843c93 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -104,6 +104,10 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
 {
   MYSQL_ERROR *err= 0;
   DBUG_ENTER("push_warning");
+
+  if (level == MYSQL_ERROR::WARN_LEVEL_NOTE && !(thd->options & OPTION_NOTES))
+    return(0);
+
   if (thd->query_id != thd->warn_id)
     mysql_reset_errors(thd);