Fixed failing test cases and compiler warnings
- Fixed wait condition in kill_processlist-6619 - Updated Ssl_chiper for openssl tests - Added supression for valgrinds when using libcrypto - Fixed wrong argument to pthread_mutex in server_audit.c when compiling with debug - Adding missing debug_sync_update() to debug_sync.h - Added initializers to some variables and fixed error handling in jsonudf.cpp - Fixed cluster_filter_unpack_varchar which doesn't have a stable index type. - Updated compiler_warnings.supp
This commit is contained in:
parent
ce38adddfa
commit
f6cc7f1bdc
@ -1,5 +1,5 @@
|
||||
#
|
||||
# MDEV-6619 SHOW PROCESSLIST returns empty result set after KILL QUERY
|
||||
# 6619 SHOW PROCESSLIST returns empty result set after KILL QUERY
|
||||
#
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_debug_sync.inc
|
||||
@ -23,5 +23,12 @@ SET DEBUG_SYNC='now SIGNAL go';
|
||||
--error ER_QUERY_INTERRUPTED
|
||||
reap;
|
||||
SET DEBUG_SYNC='reset';
|
||||
|
||||
# Wait until default connection has reset query string
|
||||
let $wait_condition=
|
||||
SELECT COUNT(*) = 1 from information_schema.processlist
|
||||
WHERE info is NULL;
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--replace_column 1 # 3 # 6 # 7 #
|
||||
SHOW PROCESSLIST;
|
||||
|
@ -132,7 +132,7 @@ drop table t1;
|
||||
# verification of servers certificate by setting both ca certificate
|
||||
# and ca path to NULL
|
||||
#
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
|
||||
--echo End of 5.0 tests
|
||||
|
||||
@ -257,7 +257,7 @@ select 'is still running; no cipher request crashed the server' as result from d
|
||||
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
|
||||
FLUSH PRIVILEGES;
|
||||
connect(con1,localhost,bug42158,,,,,SSL);
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
disconnect con1;
|
||||
connection default;
|
||||
|
@ -15,6 +15,7 @@ let $mysql=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$
|
||||
disable_abort_on_error;
|
||||
echo TLS1.2 ciphers: user is ok with any cipher;
|
||||
exec $mysql --ssl-cipher=AES128-SHA256;
|
||||
--replace_result DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-GCM-SHA384
|
||||
exec $mysql --ssl-cipher=TLSv1.2;
|
||||
echo TLS1.2 ciphers: user requires SSLv3 cipher RC4-SHA;
|
||||
exec $mysql --user ssl_sslv3 --ssl-cipher=AES128-SHA256;
|
||||
|
@ -11,7 +11,7 @@
|
||||
connect (ssl_con,localhost,root,,,,,SSL);
|
||||
|
||||
# Check ssl turned on
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
|
||||
# Check ssl expiration
|
||||
@ -22,7 +22,7 @@ SHOW STATUS LIKE 'Ssl_server_not_after';
|
||||
-- source include/common-tests.inc
|
||||
|
||||
# Check ssl turned on
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
|
||||
#
|
||||
|
@ -11,7 +11,7 @@
|
||||
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
|
||||
|
||||
# Check ssl turned on
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
|
||||
# Check compression turned on
|
||||
@ -21,7 +21,7 @@ SHOW STATUS LIKE 'Compression';
|
||||
-- source include/common-tests.inc
|
||||
|
||||
# Check ssl turned on
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
|
||||
# Check compression turned on
|
||||
|
@ -7,7 +7,7 @@
|
||||
connect (ssl_con,localhost,root,,,,,SSL read_timeout=5);
|
||||
|
||||
--echo # Check ssl turned on
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
|
||||
# --error CR_SERVER_LOST
|
||||
|
@ -1158,6 +1158,13 @@
|
||||
fun:SSL_library_init
|
||||
}
|
||||
|
||||
{
|
||||
libcrypto 2.2.1 leak
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
...
|
||||
fun:ERR_get_state
|
||||
}
|
||||
|
||||
{
|
||||
Problem with udf and libresolve
|
||||
|
@ -97,13 +97,11 @@ static void closelog() {}
|
||||
#define FLOGGER_NO_PSI
|
||||
|
||||
/* How to access the pthread_mutex in mysql_mutex_t */
|
||||
//#ifdef SAFE_MUTEX
|
||||
//#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
|
||||
//#elif defined(MY_PTHREAD_FASTMUTEX)
|
||||
//#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
|
||||
//#else
|
||||
#if defined(SAFE_MUTEX) || defined(MY_PTHREAD_FASTMUTEX)
|
||||
#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
|
||||
#else
|
||||
#define mysql_mutex_real_mutex(A) &(A)->m_mutex
|
||||
//#endif
|
||||
#endif
|
||||
|
||||
#define flogger_mutex_init(A,B,C) do{}while(0)
|
||||
#define flogger_mutex_destroy(A) do{}while(0)
|
||||
|
@ -44,6 +44,7 @@ extern void debug_sync_end(void);
|
||||
extern void debug_sync_init_thread(THD *thd);
|
||||
extern void debug_sync_end_thread(THD *thd);
|
||||
extern bool debug_sync_set_action(THD *thd, const char *action_str, size_t len);
|
||||
extern bool debug_sync_update(THD *thd, char *val_str);
|
||||
|
||||
#endif /* defined(ENABLED_DEBUG_SYNC) */
|
||||
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include "strfunc.h"
|
||||
#include "tztime.h" // my_tz_find, my_tz_SYSTEM, struct Time_zone
|
||||
#include "rpl_mi.h" // For Multi-Source Replication
|
||||
#include "debug_sync.h"
|
||||
|
||||
/*
|
||||
a set of mostly trivial (as in f(X)=X) defines below to make system variable
|
||||
@ -1455,7 +1456,6 @@ public:
|
||||
}
|
||||
bool session_update(THD *thd, set_var *var)
|
||||
{
|
||||
extern bool debug_sync_update(THD *thd, char *val_str);
|
||||
return debug_sync_update(thd, var->save_result.string_value.str);
|
||||
}
|
||||
bool global_update(THD *thd, set_var *var)
|
||||
|
@ -533,7 +533,7 @@ PVAL JSNX::CalculateArray(PGLOBAL g, PJAR arp, int n)
|
||||
/*********************************************************************************/
|
||||
my_bool JSNX::CheckPath(PGLOBAL g)
|
||||
{
|
||||
PJVAL val;
|
||||
PJVAL val= NULL;
|
||||
PJSON row = Row;
|
||||
|
||||
for (int i = 0; i < Nod && row; i++) {
|
||||
@ -1302,7 +1302,7 @@ static my_bool CalcLen(UDF_ARGS *args, my_bool obj,
|
||||
{
|
||||
char fn[_MAX_PATH];
|
||||
unsigned long i, k, m, n;
|
||||
long fl, j = -1;
|
||||
long fl= 0, j = -1;
|
||||
|
||||
reslen = args->arg_count + 2;
|
||||
|
||||
@ -2087,7 +2087,7 @@ my_bool json_object_nonull_init(UDF_INIT *initid, UDF_ARGS *args,
|
||||
char *json_object_nonull(UDF_INIT *initid, UDF_ARGS *args, char *result,
|
||||
unsigned long *res_length, char *, char *)
|
||||
{
|
||||
char *str;
|
||||
char *str= 0;
|
||||
PGLOBAL g = (PGLOBAL)initid->ptr;
|
||||
|
||||
if (!g->Xchk) {
|
||||
@ -2621,7 +2621,7 @@ char *json_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
|
||||
} // endif Xchk
|
||||
|
||||
if (!CheckMemory(g, initid, args, 2, false, false, true)) {
|
||||
PJSON top;
|
||||
PJSON top= 0;
|
||||
PJVAL jvp;
|
||||
PJSON jsp[2] = {NULL, NULL};
|
||||
|
||||
@ -4721,7 +4721,7 @@ char *jbin_set_item(UDF_INIT *initid, UDF_ARGS *args, char *result,
|
||||
my_bool b = true;
|
||||
PJSON jsp;
|
||||
PJSNX jsx;
|
||||
PJVAL jvp;
|
||||
PJVAL jvp= 0;
|
||||
PBSON bsp = NULL;
|
||||
PGLOBAL g = (PGLOBAL)initid->ptr;
|
||||
PGLOBAL gb = GetMemPtr(g, args, 0);
|
||||
@ -4742,6 +4742,7 @@ char *jbin_set_item(UDF_INIT *initid, UDF_ARGS *args, char *result,
|
||||
if (!g->Xchk) {
|
||||
if (CheckMemory(g, initid, args, 1, true, false, true)) {
|
||||
PUSH_WARNING("CheckMemory error");
|
||||
goto fin;
|
||||
} else
|
||||
jvp = MakeValue(g, args, 0);
|
||||
|
||||
|
@ -182,14 +182,14 @@ a b c d e f
|
||||
3 30 200 2000 20000 200000
|
||||
explain select * from t1 where b > "0";
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 index b b NULL NULL NULL; Using where; Using index
|
||||
1 SIMPLE t1 # b b NULL NULL NULL; Using where; Using index
|
||||
select * from t1 where b > "0";
|
||||
a b c d e f
|
||||
2 20 100 1000 10000 100000
|
||||
3 30 200 2000 20000 200000
|
||||
explain select * from t1 where d > "0";
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 index d d NULL NULL NULL; Using where; Using index
|
||||
1 SIMPLE t1 # d d NULL NULL NULL; Using where; Using index
|
||||
select * from t1 where d > "0";
|
||||
a b c d e f
|
||||
2 20 100 1000 10000 100000
|
||||
|
@ -82,11 +82,11 @@ alter table t1 add key d(d,a) clustering=yes, add key b(b) clustering=yes;
|
||||
explain select * from t1 where c > "0";
|
||||
select * from t1 where c > "0";
|
||||
|
||||
--replace_column 7 NULL 9 NULL;
|
||||
--replace_column 4 # 7 NULL 9 NULL;
|
||||
explain select * from t1 where b > "0";
|
||||
select * from t1 where b > "0";
|
||||
|
||||
--replace_column 7 NULL 9 NULL;
|
||||
--replace_column 4 # 7 NULL 9 NULL;
|
||||
explain select * from t1 where d > "0";
|
||||
select * from t1 where d > "0";
|
||||
|
||||
|
@ -184,10 +184,10 @@ jemalloc/src/jemalloc\.c: set but not used
|
||||
#
|
||||
# Connect engine
|
||||
#
|
||||
storage/connect/ha_connect\.cc: might be clobbered by ~longjmp~
|
||||
storage/connect/connect\.cc: might be clobbered by ~longjmp~
|
||||
storage/connect/ha_connect\.cc: might be clobbered by .*longjmp
|
||||
storage/connect/connect\.cc: might be clobbered by .*longjmp
|
||||
storage/connect/filamvct\.cpp: ignoring return value of
|
||||
storage/connect/filamvct\.cpp: might be clobbered by ~longjmp~
|
||||
storage/connect/filamvct\.cpp: might be clobbered by .*longjmp
|
||||
storage/connect/xindex\.cpp: ignoring return value of
|
||||
storage/connect/value\.cpp: always false
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user