diff --git a/sql/table.cc b/sql/table.cc

index 92e3d2e4800..f49eb9c0cc5 100644

--- a/sql/table.cc

+++ b/sql/table.cc

@@ -3322,6 +3322,7 @@ int TABLE_SHARE::init_from_sql_statement_string(THD *thd, bool write,

   handlerton *hton= plugin_hton(db_plugin);

   LEX_CUSTRING frm= {0,0};

   LEX_CSTRING db_backup= thd->db;

+  Turn_errors_to_warnings_handler silencer;

   DBUG_ENTER("TABLE_SHARE::init_from_sql_statement_string");

   /*

@@ -3351,6 +3352,8 @@ int TABLE_SHARE::init_from_sql_statement_string(THD *thd, bool write,

   thd->reset_db(&db);

   lex_start(thd);

+  thd->push_internal_handler(&silencer);

+

   if (unlikely((error= parse_sql(thd, & parser_state, NULL) ||

                 sql_unusable_for_discovery(thd, hton, sql_copy))))

     goto ret;

@@ -3378,6 +3381,7 @@ int TABLE_SHARE::init_from_sql_statement_string(THD *thd, bool write,

   }

 ret:

+  thd->pop_internal_handler();

   my_free(const_cast<uchar*>(frm.str));

   lex_end(thd->lex);

   thd->reset_db(&db_backup);

@@ -3386,9 +3390,8 @@ int TABLE_SHARE::init_from_sql_statement_string(THD *thd, bool write,

     thd->restore_active_arena(arena, &backup);

   reenable_binlog(thd);

   thd->variables.character_set_client= old_cs;

-  if (unlikely(thd->is_error() || error))

+  if (silencer.errors || error)

   {

-    thd->clear_error();

     my_error(ER_SQL_DISCOVER_ERROR, MYF(0),

              plugin_name(db_plugin)->str, db.str, table_name.str,

              sql_copy);

@@ -8354,7 +8357,8 @@ bool is_simple_order(ORDER *order)

 class Turn_errors_to_warnings_handler : public Internal_error_handler

 {

 public:

-  Turn_errors_to_warnings_handler() {}

+  int errors;

+  Turn_errors_to_warnings_handler() : errors(0) {}

   bool handle_condition(THD *thd,

                         uint sql_errno,

                         const char* sqlstate,

@@ -8364,7 +8368,10 @@ class Turn_errors_to_warnings_handler : public Internal_error_handler

   {

     *cond_hdl= NULL;

     if (*level == Sql_condition::WARN_LEVEL_ERROR)

+    {

       *level= Sql_condition::WARN_LEVEL_WARN;

+      errors++;

+    }

     return(0);

   }

 };