diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 5f4ca8bc421..baba004a835 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -1604,6 +1604,15 @@
    obj:/usr/lib64/libcrypto.so*
 }
 
+{
+   OpenSSL 1.1.0i wrong jump
+   Memcheck:Cond
+   fun:bcmp
+   fun:fips_rsa_encrypt_test
+   ...   
+   fun:OPENSSL_init_library
+}
+
 #
 # libmarias3 problems
 #
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 6d40d951615..f91589e581d 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2673,6 +2673,7 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
     /* 'parent_lex' is used in init_query() so it must be before it. */
     schema_select_lex->parent_lex= lex;
     schema_select_lex->init_query();
+    schema_select_lex->select_number= 0;
     if (!schema_select_lex->add_table_to_list(thd, table_ident, 0, 0, TL_READ,
                                               MDL_SHARED_READ))
       DBUG_RETURN(1);