From 2f4db5348a43dea3ba21831955d0a029140d797c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Oct 2013 08:33:09 +0300 Subject: [PATCH 1/4] MDEV-4981: Account for queries handled by query-cache in USER_STATISTICS (and in HOST_STATISTICS) Added collection statistics for queries resolved via query cache. --- mysql-test/r/query_cache.result | 79 +++++++++++++++++++++++++++++++++ mysql-test/t/query_cache.test | 52 ++++++++++++++++++++++ sql/sql_cache.cc | 6 ++- sql/sql_parse.cc | 5 ++- 4 files changed, 140 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 2dd89d0e4bb..975b89b6e7a 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -1932,6 +1932,85 @@ set local query_cache_type= on; select @@query_cache_size, @@global.query_cache_type, @@local.query_cache_type; @@query_cache_size @@global.query_cache_type @@local.query_cache_type 20971520 ON ON +# +# MDEV-4981: Account for queries handled by query-cache in +# USER_STATISTICS (and in HOST_STATISTICS) +# +SET GLOBAL userstat=1; +set GLOBAL query_cache_size=1355776; +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +reset query cache; +flush status; +create table t1 (a int); +insert into t1 values (1); +select * from t1; +a +1 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +1 1 0 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +2 2 0 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 0 +select * from t1; +a +1 +select * from t1; +a +1 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +5 5 0 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +6 6 0 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 2 +drop table t1; +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +flush status; +create table t1 (a int); +select * from t1; +a +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +1 0 1 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +2 1 1 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 0 +select * from t1; +a +select * from t1; +a +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +5 2 3 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +6 3 3 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 2 +drop table t1; +SET GLOBAL userstat=default; +End of 5.5 tests restore defaults SET GLOBAL query_cache_type= default; SET GLOBAL query_cache_size= default; diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index c8371ea31f1..d2f3e22d19d 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -1617,6 +1617,58 @@ select @@query_cache_size, @@global.query_cache_type, @@local.query_cache_type; set local query_cache_type= on; select @@query_cache_size, @@global.query_cache_type, @@local.query_cache_type; +--echo # +--echo # MDEV-4981: Account for queries handled by query-cache in +--echo # USER_STATISTICS (and in HOST_STATISTICS) +--echo # + +SET GLOBAL userstat=1; +set GLOBAL query_cache_size=1355776; +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +reset query cache; +flush status; + +create table t1 (a int); +insert into t1 values (1); +select * from t1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; +select * from t1; +select * from t1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; + +drop table t1; +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +flush status; + +create table t1 (a int); +select * from t1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; +select * from t1; +select * from t1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; + +drop table t1; +SET GLOBAL userstat=default; + +--echo End of 5.5 tests --echo restore defaults SET GLOBAL query_cache_type= default; diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 99baa70070e..2e9a183ce63 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2074,9 +2074,13 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", } #endif /*!EMBEDDED_LIBRARY*/ - thd->limit_found_rows = query->found_rows(); + thd->sent_row_count= thd->limit_found_rows = query->found_rows(); thd->status_var.last_query_cost= 0.0; thd->query_plan_flags= (thd->query_plan_flags & ~QPLAN_QC_NO) | QPLAN_QC; + if (!thd->sent_row_count) + status_var_increment(thd->status_var.empty_queries); + else + status_var_add(thd->status_var.rows_sent, thd->sent_row_count); /* End the statement transaction potentially started by an diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index cfd31ada888..49b8cde386a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4656,7 +4656,8 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables) /* Count number of empty select queries */ if (!thd->sent_row_count) status_var_increment(thd->status_var.empty_queries); - status_var_add(thd->status_var.rows_sent, thd->sent_row_count); + else + status_var_add(thd->status_var.rows_sent, thd->sent_row_count); return res; } @@ -5790,6 +5791,8 @@ void mysql_parse(THD *thd, char *rawbuf, uint length, { /* Update statistics for getting the query from the cache */ thd->lex->sql_command= SQLCOM_SELECT; + status_var_increment(thd->status_var.com_stat[thd->lex->sql_command]); + thd->update_stats(); } DBUG_VOID_RETURN; } From 3cc3bcfcc5f80505fa48681b86d5f486cf9dc248 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Oct 2013 15:57:19 +0300 Subject: [PATCH 2/4] MDEV-5107:Left Join Yields All Nulls Instead of Appropriate Matches MDEV-5034:Wrong result on LEFT JOIN with a SELECT SQ or a merge view, UNION in IN subquery Make reset null_row same as it was set in evaluate_null_complemented_join_record(). The problem was that view firlds detect null_row by not-yet-reset table. --- mysql-test/r/view.result | 46 ++++++++++++++++++++++++++++++++++++++++ mysql-test/t/view.test | 37 ++++++++++++++++++++++++++++++++ sql/sql_select.cc | 10 ++++++++- 3 files changed, 92 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 2d89c66a226..e0323c305f5 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -4663,6 +4663,52 @@ execute s; deallocate prepare s; drop view v1; drop tables t1,t2; +# +# MDEV-5034 (duplicate of MDEV-5107): +# Left Join Yields All Nulls Instead of Appropriate Matches +# +# test #1 +CREATE TABLE t1 (state VARCHAR(32), INDEX(state)); +INSERT INTO t1 VALUES ('Indiana'),('Vermont'); +CREATE TABLE t2 (state VARCHAR(32)); +INSERT INTO t2 VALUES ('Hawaii'),('Oregon'),('Vermont'); +CREATE ALGORITHM=MERGE VIEW v1 AS SELECT t1.* FROM t2, t1; +SELECT * FROM t1 AS outer_t1 LEFT JOIN v1 AS joined_t1 +ON (joined_t1.state = outer_t1.state AND joined_t1.state IN ( SELECT 'Vermont' UNION SELECT 'Florida' ) ); +state state +Indiana NULL +Vermont Vermont +Vermont Vermont +Vermont Vermont +SELECT * FROM t1 AS outer_t1 LEFT JOIN (SELECT t1.* FROM t2, t1) AS joined_t1 ON (joined_t1.state = outer_t1.state AND joined_t1.state IN ( SELECT 'Vermont' UNION SELECT 'Florida' ) ); +state state +Indiana NULL +Vermont Vermont +Vermont Vermont +Vermont Vermont +drop view v1; +drop table t1, t2; +# test #1 +CREATE TABLE t1 (a INT, b VARCHAR(1), INDEX(b,a)); +INSERT INTO t1 VALUES (4,'p'),(1,'q'),(9,'w'); +CREATE TABLE t2 (c VARCHAR(1), INDEX(c)); +INSERT INTO t2 VALUES ('q'),('a'); +CREATE ALGORITHM=MERGE VIEW v1 AS SELECT t1a.* FROM t1, t1 AS t1a; +SELECT * FROM t2 LEFT JOIN v1 ON ( c=b AND a IN ( 1,6 ) ); +c a b +a NULL NULL +q 1 q +q 1 q +q 1 q +CREATE OR REPLACE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT t1a.* FROM t1, t1 AS t1a; +SELECT * FROM t2 LEFT JOIN v1 ON ( c=b AND a IN ( 1,6 ) ); +c a b +a NULL NULL +q 1 q +q 1 q +q 1 q +drop view v1; +drop table t1,t2; # ----------------------------------------------------------------- # -- End of 5.3 tests. # ----------------------------------------------------------------- diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index f3f8dbfe77f..0547004cd9c 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -4610,6 +4610,43 @@ deallocate prepare s; drop view v1; drop tables t1,t2; +--echo # +--echo # MDEV-5034 (duplicate of MDEV-5107): +--echo # Left Join Yields All Nulls Instead of Appropriate Matches +--echo # + + --echo # test #1 + +CREATE TABLE t1 (state VARCHAR(32), INDEX(state)); +INSERT INTO t1 VALUES ('Indiana'),('Vermont'); + +CREATE TABLE t2 (state VARCHAR(32)); +INSERT INTO t2 VALUES ('Hawaii'),('Oregon'),('Vermont'); + +CREATE ALGORITHM=MERGE VIEW v1 AS SELECT t1.* FROM t2, t1; +SELECT * FROM t1 AS outer_t1 LEFT JOIN v1 AS joined_t1 +ON (joined_t1.state = outer_t1.state AND joined_t1.state IN ( SELECT 'Vermont' UNION SELECT 'Florida' ) ); + +SELECT * FROM t1 AS outer_t1 LEFT JOIN (SELECT t1.* FROM t2, t1) AS joined_t1 ON (joined_t1.state = outer_t1.state AND joined_t1.state IN ( SELECT 'Vermont' UNION SELECT 'Florida' ) ); + +drop view v1; +drop table t1, t2; + +--echo # test #1 + +CREATE TABLE t1 (a INT, b VARCHAR(1), INDEX(b,a)); +INSERT INTO t1 VALUES (4,'p'),(1,'q'),(9,'w'); + +CREATE TABLE t2 (c VARCHAR(1), INDEX(c)); +INSERT INTO t2 VALUES ('q'),('a'); +CREATE ALGORITHM=MERGE VIEW v1 AS SELECT t1a.* FROM t1, t1 AS t1a; +SELECT * FROM t2 LEFT JOIN v1 ON ( c=b AND a IN ( 1,6 ) ); +CREATE OR REPLACE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT t1a.* FROM t1, t1 AS t1a; +SELECT * FROM t2 LEFT JOIN v1 ON ( c=b AND a IN ( 1,6 ) ); + +drop view v1; +drop table t1,t2; + --echo # ----------------------------------------------------------------- --echo # -- End of 5.3 tests. --echo # ----------------------------------------------------------------- diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 10575bc2d98..82a2471f99b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16132,7 +16132,15 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) { DBUG_ENTER("sub_select"); - join_tab->table->null_row=0; + if (join_tab->last_inner) + { + JOIN_TAB *last_inner_tab= join_tab->last_inner; + for (JOIN_TAB *jt= join_tab; jt <= last_inner_tab; jt++) + jt->table->null_row= 0; + } + else + join_tab->table->null_row=0; + if (end_of_records) { enum_nested_loop_state nls= From 73f8b4dac263964482b532199151c87596f191b7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Oct 2013 16:07:25 +0300 Subject: [PATCH 3/4] MDEV-4981: Account for queries handled by query-cache in USER_STATISTICS (and in HOST_STATISTICS) fix for SP & PS --- mysql-test/r/query_cache.result | 67 +++++++++++++++++++++++++++++++++ mysql-test/t/query_cache.test | 40 ++++++++++++++++++++ sql/sp_head.cc | 8 ++++ sql/sql_parse.cc | 2 +- sql/sql_prepare.cc | 6 +++ 5 files changed, 122 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 975b89b6e7a..862e7e0d8df 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -2008,7 +2008,74 @@ SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES show status like "Qcache_hits"; Variable_name Value Qcache_hits 2 +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +flush status; +create procedure p1() +select * from t1; +call p1; +a +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +1 0 1 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +2 1 1 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 0 +call p1; +a +call p1; +a +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +5 2 3 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +6 3 3 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 2 +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +flush status; +SET GLOBAL query_cache_size= 0; +call p1; +a +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +1 0 1 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +2 1 1 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 0 +call p1; +a +call p1; +a +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +5 2 3 +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +SELECT_COMMANDS ROWS_SENT EMPTY_QUERIES +6 3 3 +show status like "Qcache_hits"; +Variable_name Value +Qcache_hits 0 +drop procedure p1; drop table t1; +set GLOBAL query_cache_size=1355776; SET GLOBAL userstat=default; End of 5.5 tests restore defaults diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index d2f3e22d19d..47fa628190a 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -1665,7 +1665,47 @@ select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STAT where USER="root"; show status like "Qcache_hits"; +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +flush status; + +create procedure p1() + select * from t1; +call p1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; +call p1; +call p1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; + +FLUSH USER_STATISTICS; +FLUSH CLIENT_STATISTICS; +flush status; + +SET GLOBAL query_cache_size= 0; +call p1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; +call p1; +call p1; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.CLIENT_STATISTICS +where CLIENT="localhost"; +select SELECT_COMMANDS,ROWS_SENT,EMPTY_QUERIES from INFORMATION_SCHEMA.USER_STATISTICS +where USER="root"; +show status like "Qcache_hits"; +drop procedure p1; drop table t1; +set GLOBAL query_cache_size=1355776; SET GLOBAL userstat=default; --echo End of 5.5 tests diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 244fba2819c..840376b2c14 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3137,7 +3137,15 @@ sp_instr_stmt::execute(THD *thd, uint *nextp) log_slow_statement(thd); } else + { + /* change statistics */ + enum_sql_command save_sql_command= thd->lex->sql_command; + thd->lex->sql_command= SQLCOM_SELECT; + status_var_increment(thd->status_var.com_stat[SQLCOM_SELECT]); + thd->update_stats(); + thd->lex->sql_command= save_sql_command; *nextp= m_ip+1; + } thd->set_query(query_backup); thd->query_name_consts= 0; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 49b8cde386a..2d4293fc1d7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5791,7 +5791,7 @@ void mysql_parse(THD *thd, char *rawbuf, uint length, { /* Update statistics for getting the query from the cache */ thd->lex->sql_command= SQLCOM_SELECT; - status_var_increment(thd->status_var.com_stat[thd->lex->sql_command]); + status_var_increment(thd->status_var.com_stat[SQLCOM_SELECT]); thd->update_stats(); } DBUG_VOID_RETURN; diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index dfaab2a2f92..6b4865027c8 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3905,6 +3905,12 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) error= mysql_execute_command(thd); MYSQL_QUERY_EXEC_DONE(error); } + else + { + thd->lex->sql_command= SQLCOM_SELECT; + status_var_increment(thd->status_var.com_stat[SQLCOM_SELECT]); + thd->update_stats(); + } } /* From de4ca539b896abfb2888ce7dee6f7de39d2e9657 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 16 Oct 2013 17:37:11 +0400 Subject: [PATCH 4/4] MDEV-4890 Valgrind warnings on shutdown on a build with openSSL --- mysql-test/valgrind.supp | 12 ++++++++++++ sql/mysqld.cc | 4 ++++ sql/slave.cc | 2 ++ vio/vio.c | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index e7f5a7880d2..26c0424ba58 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -1003,6 +1003,18 @@ fun:row_drop_table_for_mysql } +{ + OpenSSL still reachable. + Memcheck:Leak + fun:*alloc + fun:CRYPTO_malloc + fun:sk_new + obj:*libssl* + fun:SSL_COMP_get_compression_methods + fun:SSL_library_init +} + + { Problem with udf and libresolve Memcheck:Cond diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f322cd1bb01..b709d71f817 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2094,6 +2094,9 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache) /* It's safe to broadcast outside a lock (COND... is not deleted here) */ DBUG_PRINT("signal", ("Broadcasting COND_thread_count")); DBUG_LEAVE; // Must match DBUG_ENTER() +#ifndef EMBEDDED_LIBRARY + ERR_remove_state(0); +#endif my_thread_end(); (void) pthread_cond_broadcast(&COND_thread_count); @@ -3750,6 +3753,7 @@ static void init_ssl() opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher, &error); DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); + ERR_remove_state(0); if (!ssl_acceptor_fd) { sql_print_warning("Failed to setup SSL"); diff --git a/sql/slave.cc b/sql/slave.cc index d401eacc9df..202e624ce71 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2854,6 +2854,7 @@ err: DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); + ERR_remove_state(0); pthread_exit(0); return 0; // Avoid compiler warnings } @@ -3250,6 +3251,7 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); + ERR_remove_state(0); pthread_exit(0); return 0; // Avoid compiler warnings } diff --git a/vio/vio.c b/vio/vio.c index 486fe63da05..7b2cf45142f 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -250,5 +250,11 @@ void vio_end(void) { #ifdef HAVE_YASSL yaSSL_CleanUp(); +#elif defined(HAVE_OPENSSL) + // This one is needed on the client side + ERR_remove_state(0); + ERR_free_strings(); + EVP_cleanup(); + CRYPTO_cleanup_all_ex_data(); #endif }