Merge 10.5 into 10.6

MariaDB · Oct 6, 2022 · 6dc157f · 6dc157f
2 parents 286acaa + 8d6421a
commit 6dc157f
Show file tree

Hide file tree

Showing 117 changed files with 1,034 additions and 596 deletions.
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2000, 2015, Oracle and/or its affiliates.
-   Copyright (c) 2011, 2017, MariaDB
+   Copyright (c) 2011, 2022, MariaDB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -382,11 +382,7 @@ static int write_to_table(char *filename, MYSQL *mysql)
   {
     if (verbose)
       fprintf(stdout, "Deleting the old data from table %s\n", tablename);
-#ifdef HAVE_SNPRINTF
     snprintf(sql_statement, FN_REFLEN*16+256, "DELETE FROM %s", tablename);
-#else
-    sprintf(sql_statement, "DELETE FROM %s", tablename);
-#endif
     if (mysql_query(mysql, sql_statement))
     {
       db_error_with_table(mysql, tablename);

diff --git a/config.h.cmake b/config.h.cmake
@@ -221,7 +221,6 @@
 #cmakedefine HAVE_SIGWAIT 1
 #cmakedefine HAVE_SIGWAITINFO 1
 #cmakedefine HAVE_SLEEP 1
-#cmakedefine HAVE_SNPRINTF 1
 #cmakedefine HAVE_STPCPY 1
 #cmakedefine HAVE_STRERROR 1
 #cmakedefine HAVE_STRCOLL 1

diff --git a/configure.cmake b/configure.cmake
@@ -406,7 +406,6 @@ CHECK_FUNCTION_EXISTS (sigwait HAVE_SIGWAIT)
 CHECK_FUNCTION_EXISTS (sigwaitinfo HAVE_SIGWAITINFO)
 CHECK_FUNCTION_EXISTS (sigset HAVE_SIGSET)
 CHECK_FUNCTION_EXISTS (sleep HAVE_SLEEP)
-CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
 CHECK_FUNCTION_EXISTS (stpcpy HAVE_STPCPY)
 CHECK_FUNCTION_EXISTS (strcoll HAVE_STRCOLL)
 CHECK_FUNCTION_EXISTS (strerror HAVE_STRERROR)

diff --git a/mysql-test/include/ipv6.inc b/mysql-test/include/ipv6.inc
@@ -22,4 +22,3 @@ eval SET PASSWORD FOR testuser1@'$IPv6' = PASSWORD ('9876');
 --replace_result ::1 localhost
 SELECT USER();
 eval DROP USER testuser1@'$IPv6';
-
diff --git a/mysql-test/include/long_test.inc b/mysql-test/include/long_test.inc
@@ -2,3 +2,5 @@
 # We can use this to schedule such test early (to not be left with
 # only one or two long tests running, and rests of works idle), or to
 # run a quick test skipping long-running test cases.
+
+--source include/no_valgrind_without_big.inc
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
@@ -1,3 +1,5 @@
+--source include/no_valgrind_without_big.inc
+
 # ==== Purpose ====
 #
 # Configure two servers to be replication master and slave.

diff --git a/mysql-test/main/alter_table.test b/mysql-test/main/alter_table.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 #
 # Test of alter table

diff --git a/mysql-test/main/compress.test b/mysql-test/main/compress.test
@@ -1,6 +1,8 @@
 # Turn on compression between the client and server
 # and run a number of tests
 
+# Too slow for valgrind
+--source include/no_valgrind_without_big.inc
 # Can't test with embedded server
 -- source include/not_embedded.inc
 -- source include/have_compress.inc

diff --git a/mysql-test/main/ctype_big5.test b/mysql-test/main/ctype_big5.test
@@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_big5.inc
 
 #

diff --git a/mysql-test/main/ctype_gb2312.test b/mysql-test/main/ctype_gb2312.test
@@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_gb2312.inc
 
 #

diff --git a/mysql-test/main/ctype_gbk.test b/mysql-test/main/ctype_gbk.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 -- source include/have_gbk.inc
 
 #

diff --git a/mysql-test/main/ctype_sjis.test b/mysql-test/main/ctype_sjis.test
@@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_sjis.inc
 
 #

diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Tests with the utf8 character set
 #

diff --git a/mysql-test/main/gis-precise.test b/mysql-test/main/gis-precise.test
@@ -1,5 +1,5 @@
--- source include/have_geometry.inc
-
+--source include/no_valgrind_without_big.inc
+--source include/have_geometry.inc
 
 #
 # Spatial objects

diff --git a/mysql-test/main/group_min_max.test b/mysql-test/main/group_min_max.test
@@ -3,6 +3,7 @@
 # The queries in this file test query execution via QUICK_GROUP_MIN_MAX_SELECT.
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/default_optimizer_switch.inc
 --source include/have_sequence.inc
 --source include/have_innodb.inc

diff --git a/mysql-test/main/index_merge_innodb.test b/mysql-test/main/index_merge_innodb.test
@@ -11,6 +11,7 @@
 #
 
 # Slow test, don't run during staging part
+--source include/long_test.inc
 --source include/not_staging.inc
 --source include/have_innodb.inc
 

diff --git a/mysql-test/main/index_merge_myisam.test b/mysql-test/main/index_merge_myisam.test
@@ -9,6 +9,7 @@
 #               wrapper t/index_merge_innodb.test sources now several 
 #               include/index_merge*.inc files
 #
+--source include/no_valgrind_without_big.inc
 
 SET DEFAULT_STORAGE_ENGINE = MyISAM;
 # MyISAM supports Merge tables

diff --git a/mysql-test/main/information_schema_all_engines.test b/mysql-test/main/information_schema_all_engines.test
@@ -2,6 +2,7 @@
 # information_schema_db.test whose results depends on which engines are
 # available (since these engines inject tables into INFORMATION_SCHEMA).
 
+--source include/no_valgrind_without_big.inc
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_perfschema.inc

diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test
@@ -1,4 +1,5 @@
 --source include/innodb_prefix_index_cluster_optimization.inc
+--source include/no_valgrind_without_big.inc
 
 SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB';
 

diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test
@@ -1,9 +1,11 @@
+--source include/no_valgrind_without_big.inc
+--source include/default_optimizer_switch.inc
+--source include/default_charset.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11;
 DROP DATABASE IF EXISTS world;
 --enable_warnings
---source include/default_optimizer_switch.inc
---source include/default_charset.inc
 
 set @org_optimizer_switch=@@optimizer_switch;
 set @save_join_cache_level=@@join_cache_level;

diff --git a/mysql-test/main/log_slow.test b/mysql-test/main/log_slow.test
@@ -1,3 +1,5 @@
+--source include/no_valgrind_without_big.inc
+
 #
 # Testing of slow log query options
 #

diff --git a/mysql-test/main/mysql_client_test_comp.test b/mysql-test/main/mysql_client_test_comp.test
@@ -3,6 +3,7 @@
 # No need to run this with embedded server
 --source include/not_embedded.inc
 --source include/check_ipv6.inc
+--source include/no_valgrind_without_big.inc
 
 # need to have the dynamic loading turned on for the client plugin tests
 --source include/have_plugin_auth.inc

diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
@@ -2,6 +2,7 @@
 -- source include/have_working_dns.inc
 -- source include/have_innodb.inc
 -- source include/have_partition.inc
+-- source include/no_valgrind_without_big.inc
 
 set sql_mode="";
 

diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_utf8mb4.inc
 
 call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");

diff --git a/mysql-test/main/order_by.test b/mysql-test/main/order_by.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Testing ORDER BY
 #

diff --git a/mysql-test/main/plugin_auth.test b/mysql-test/main/plugin_auth.test
@@ -2,6 +2,7 @@
 --source include/not_embedded.inc
 --source include/mysql_upgrade_preparation.inc
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 
 SET GLOBAL SQL_MODE="";
 SET LOCAL SQL_MODE="";

diff --git a/mysql-test/main/pool_of_threads.test b/mysql-test/main/pool_of_threads.test
@@ -4,10 +4,11 @@
 -- source include/have_pool_of_threads.inc
 -- source include/default_optimizer_switch.inc
 
-SET optimizer_switch='outer_join_with_cache=off';
 # Slow test, don't run during staging part
 -- source include/not_staging.inc
 -- source include/long_test.inc
+
+SET optimizer_switch='outer_join_with_cache=off';
 -- source include/common-tests.inc
 SET optimizer_switch=default;
 

diff --git a/mysql-test/main/query_cache.test b/mysql-test/main/query_cache.test
@@ -1,5 +1,6 @@
 -- source include/have_query_cache.inc
 -- source include/long_test.inc
+-- source include/no_valgrind_without_big.inc
 
 set @save_query_cache_size=@@query_cache_size;
 #

diff --git a/mysql-test/main/query_cache_debug.test b/mysql-test/main/query_cache_debug.test
@@ -2,6 +2,7 @@
 --source include/have_query_cache.inc
 --source include/have_debug_sync.inc
 --source include/long_test.inc
+--source include/no_valgrind_without_big.inc
 
 set global query_cache_type= ON;
 set @save_query_cache_size=@@global.query_cache_size;

diff --git a/mysql-test/main/range.test b/mysql-test/main/range.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Problem with range optimizer
 #

diff --git a/mysql-test/main/range_innodb.test b/mysql-test/main/range_innodb.test
@@ -4,6 +4,7 @@
 
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc
 
 --disable_warnings
 drop table if exists t0, t1, t2;

diff --git a/mysql-test/main/range_vs_index_merge.test b/mysql-test/main/range_vs_index_merge.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/default_optimizer_switch.inc
 --source include/default_charset.inc
 --source include/have_sequence.inc

diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 
 SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB';

diff --git a/mysql-test/main/rowid_filter_innodb_debug.test b/mysql-test/main/rowid_filter_innodb_debug.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 
 set default_storage_engine=innodb;
 --source include/rowid_filter_debug_kill.inc

diff --git a/mysql-test/main/select.test b/mysql-test/main/select.test
@@ -2,6 +2,8 @@
 # Find string "NOTE NOTE NOTE" in order to find some 'unsure' tests
 #
 
+--source include/no_valgrind_without_big.inc
+
 #
 # Simple select test
 #

diff --git a/mysql-test/main/selectivity.test b/mysql-test/main/selectivity.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_stat_tables.inc
 --source include/have_sequence.inc
 --source include/default_charset.inc

diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_partition.inc
 --source include/have_sequence.inc
 

diff --git a/mysql-test/main/ssl-big.test b/mysql-test/main/ssl-big.test
@@ -6,6 +6,7 @@
 -- source include/have_64bit.inc
 # No point in running with valgrind as it takes 1.5 hours
 -- source include/not_valgrind.inc
+# This test often times out with MemorySanitizer.
 -- source include/not_msan.inc
 
 # Save the initial number of concurrent sessions

diff --git a/mysql-test/main/ssl.test b/mysql-test/main/ssl.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 # Turn on ssl between the client and server
 # and run a number of tests
 

diff --git a/mysql-test/main/stat_tables_disabled.test b/mysql-test/main/stat_tables_disabled.test
@@ -4,7 +4,9 @@ set @innodb_stats_persistent_sample_pages_save=
 
 set global innodb_stats_persistent= 1;
 set global innodb_stats_persistent_sample_pages=100;
+
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 
 SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB';
 

diff --git a/mysql-test/main/stat_tables_innodb.test b/mysql-test/main/stat_tables_innodb.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_sequence.inc
 

diff --git a/mysql-test/main/stat_tables_par_innodb.test b/mysql-test/main/stat_tables_par_innodb.test
@@ -1,6 +1,7 @@
 # Note that this test requires a fresh restart to not have problems with the
 # old status values
 
+--source include/no_valgrind_without_big.inc
 --source include/have_stat_tables.inc
 --source include/have_debug_sync.inc
 --source include/not_embedded.inc

diff --git a/mysql-test/main/statistics.test b/mysql-test/main/statistics.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_stat_tables.inc
 --source include/have_innodb.inc
 --disable_warnings

diff --git a/mysql-test/main/subselect_innodb.test b/mysql-test/main/subselect_innodb.test
@@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_innodb.inc
 
 # Note: the tests uses only non-semijoin subqueries so semi-join switch

diff --git a/mysql-test/main/subselect_sj.test b/mysql-test/main/subselect_sj.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Nested Loops semi-join subquery evaluation tests
 #

diff --git a/mysql-test/main/subselect_sj_jcl6.test b/mysql-test/main/subselect_sj_jcl6.test
@@ -1,6 +1,7 @@
 # 
 # Run subselect_sj.test with BKA enabled 
 #
+--source include/no_valgrind_without_big.inc
 --source include/default_optimizer_switch.inc
 
 set @save_optimizer_switch_jcl6=@@optimizer_switch;

diff --git a/mysql-test/main/trigger.test b/mysql-test/main/trigger.test
@@ -1,6 +1,7 @@
 # This test uses chmod, can't be run with root permissions
 -- source include/not_as_root.inc
---source include/default_charset.inc
+-- source include/no_valgrind_without_big.inc
+-- source include/default_charset.inc
 
 #
 # Basic triggers test

diff --git a/mysql-test/main/update_use_source.test b/mysql-test/main/update_use_source.test
@@ -1,5 +1,6 @@
 --source include/have_sequence.inc
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 
 create table t1 (old_c1 integer, old_c2 integer,c1 integer, c2 integer, c3 integer) engine=InnoDB STATS_PERSISTENT=0;
 create view v1 as select * from t1 where c2=2;

diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test
@@ -1,6 +1,7 @@
 #
 #  Window Functions Tests
 #
+--source include/no_valgrind_without_big.inc
 --source include/have_sequence.inc
 
 --disable_warnings

diff --git a/mysql-test/main/win_big-mdev-11697.test b/mysql-test/main/win_big-mdev-11697.test
@@ -1,3 +1,5 @@
+--source include/no_valgrind_without_big.inc
+
 set max_recursive_iterations=200000;
 create table test_table (id int, random_data varchar(36), static_int int, static_varchar varchar(10));