summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-01-15 15:36:50 +0200
committerMonty <monty@mariadb.org>2020-03-24 21:00:02 +0200
commitf51df1dc78ad2b8f1d3173f43e35dddecaf8a6e2 (patch)
tree0a28000a7cd0fd35c8c3803857b178dab9f98c57
parent4ef437558ae8a278f24726276bec57141db086da (diff)
downloadmariadb-git-f51df1dc78ad2b8f1d3173f43e35dddecaf8a6e2.tar.gz
Fixed valgrind warning
-rw-r--r--mysql-test/valgrind.supp9
-rw-r--r--sql/sql_parse.cc1
2 files changed, 10 insertions, 0 deletions
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);