diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-05 09:21:34 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-05 09:21:34 +0300 |
commit | 4ca56e8348c7bd20cb7544a607b730d6038746b6 (patch) | |
tree | d2f5de2baa27f1c8e05464ded94eff559e1f58c4 | |
parent | 668a5f3d122ef3c935bf365d8084fb9713f44c60 (diff) | |
parent | df94aa344b8dd219d6afbec502b53505385e495b (diff) | |
download | mariadb-git-4ca56e8348c7bd20cb7544a607b730d6038746b6.tar.gz |
Merge 10.5 into 10.6
-rw-r--r-- | client/mysqldump.c | 2 | ||||
-rw-r--r-- | mysql-test/main/sp.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/galera/r/MDEV-22708.result | 11 | ||||
-rw-r--r-- | mysql-test/suite/galera/r/galera_fulltext.result | 56 | ||||
-rw-r--r-- | mysql-test/suite/galera/t/MDEV-22708.cnf | 4 | ||||
-rw-r--r-- | mysql-test/suite/galera/t/MDEV-22708.test | 14 | ||||
-rw-r--r-- | mysql-test/suite/galera/t/galera_fulltext.test | 64 | ||||
-rw-r--r-- | mysql-test/suite/s3/mysqldump.result | 2 | ||||
-rw-r--r-- | sql/service_wsrep.cc | 11 | ||||
-rw-r--r-- | sql/sql_insert.cc | 2 | ||||
-rw-r--r-- | sql/sql_yacc.yy | 3 | ||||
-rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 10 | ||||
-rw-r--r-- | storage/innobase/trx/trx0purge.cc | 6 | ||||
-rw-r--r-- | tests/mysql_client_test.c | 30 |
14 files changed, 178 insertions, 39 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b6419e11a0e..17e793d3a9e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4474,7 +4474,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key, if (!opt_xml && opt_copy_s3_tables && (ignore_flag & IGNORE_S3_TABLE)) { DYNAMIC_STRING alter_string; - init_dynamic_string_checked(&alter_string, "ATER TABLE ", 1024, 1024); + init_dynamic_string_checked(&alter_string, "ALTER TABLE ", 1024, 1024); dynstr_append_checked(&alter_string, opt_quoted_table); dynstr_append_checked(&alter_string, " ENGINE=S3;\n"); fputs(alter_string.str, md_result_file); diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index b1c69faa83a..9e4166b42c1 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -10432,7 +10432,7 @@ SELECT VARIABLE_VALUE into @local_mem_used FROM INFORMATION_SCHEMA.SESSION_STATU CREATE PROCEDURE sp1() SELECT 1; SHOW CREATE PROCEDURE sp1; SELECT VARIABLE_VALUE-@local_mem_used FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='MEMORY_USED'; -# 10.5 FIXME: This occasionally shows 56 or 64 bytes of difference! +# FIXME: MDEV-26754 main.sp test fails for embedded server #SELECT VARIABLE_VALUE-@global_mem_used FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='MEMORY_USED'; DROP PROCEDURE sp1; --echo # End of 10.3 tests diff --git a/mysql-test/suite/galera/r/MDEV-22708.result b/mysql-test/suite/galera/r/MDEV-22708.result new file mode 100644 index 00000000000..a672ed7be0d --- /dev/null +++ b/mysql-test/suite/galera/r/MDEV-22708.result @@ -0,0 +1,11 @@ +connection node_2; +connection node_1; +SET @wsrep_forced_binlog_format_saved = @@GLOBAL.wsrep_forced_binlog_format; +SET @@GLOBAL.wsrep_forced_binlog_format = STATEMENT; +CREATE TABLE t1(c INT PRIMARY KEY) ENGINE = MyISAM; +INSERT DELAYED INTO t1 VALUES (1),(2),(3); +SELECT SLEEP(1); +SLEEP(1) +0 +DROP TABLE t1; +SET @@GLOBAL.wsrep_forced_binlog_format = @wsrep_forced_binlog_format_saved; diff --git a/mysql-test/suite/galera/r/galera_fulltext.result b/mysql-test/suite/galera/r/galera_fulltext.result index a22296278fa..94780f235ad 100644 --- a/mysql-test/suite/galera/r/galera_fulltext.result +++ b/mysql-test/suite/galera/r/galera_fulltext.result @@ -36,3 +36,59 @@ COUNT(f1) = 1000 1 DROP TABLE t1; DROP TABLE ten; +connection node_1; +SET @value=REPEAT (1,5001); +CREATE TABLE t (a VARCHAR(5000),FULLTEXT (a)) engine=innodb; +INSERT IGNORE INTO t VALUES(@value); +Warnings: +Warning 1265 Data truncated for column 'a' at row 1 +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_2; +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_1; +DROP TABLE t; +CREATE TABLE t (a VARCHAR(5000)) engine=innodb; +INSERT IGNORE INTO t VALUES(@value); +Warnings: +Warning 1265 Data truncated for column 'a' at row 1 +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_2; +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_1; +DROP TABLE t; +connection node_1; +SET @value=REPEAT (1,5001); +CREATE TABLE t (a VARCHAR(5000),FULLTEXT (a)) engine=innodb DEFAULT CHARSET=utf8; +INSERT IGNORE INTO t VALUES(@value); +Warnings: +Warning 1265 Data truncated for column 'a' at row 1 +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_2; +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_1; +DROP TABLE t; +CREATE TABLE t (a VARCHAR(5000)) engine=innodb DEFAULT CHARSET=utf8; +INSERT IGNORE INTO t VALUES(@value); +Warnings: +Warning 1265 Data truncated for column 'a' at row 1 +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_2; +SELECT COUNT(*) FROM t; +COUNT(*) +1 +connection node_1; +DROP TABLE t; diff --git a/mysql-test/suite/galera/t/MDEV-22708.cnf b/mysql-test/suite/galera/t/MDEV-22708.cnf new file mode 100644 index 00000000000..f7ac4f43082 --- /dev/null +++ b/mysql-test/suite/galera/t/MDEV-22708.cnf @@ -0,0 +1,4 @@ +!include ../galera_2nodes.cnf + +[mysqld] +log-bin
\ No newline at end of file diff --git a/mysql-test/suite/galera/t/MDEV-22708.test b/mysql-test/suite/galera/t/MDEV-22708.test new file mode 100644 index 00000000000..5f75715febf --- /dev/null +++ b/mysql-test/suite/galera/t/MDEV-22708.test @@ -0,0 +1,14 @@ +--source include/galera_cluster.inc +--source include/have_innodb.inc + +SET @wsrep_forced_binlog_format_saved = @@GLOBAL.wsrep_forced_binlog_format; +SET @@GLOBAL.wsrep_forced_binlog_format = STATEMENT; + +CREATE TABLE t1(c INT PRIMARY KEY) ENGINE = MyISAM; + +INSERT DELAYED INTO t1 VALUES (1),(2),(3); +SELECT SLEEP(1); + +DROP TABLE t1; + +SET @@GLOBAL.wsrep_forced_binlog_format = @wsrep_forced_binlog_format_saved; diff --git a/mysql-test/suite/galera/t/galera_fulltext.test b/mysql-test/suite/galera/t/galera_fulltext.test index 7e2fc5e581d..beb6a1b8f6f 100644 --- a/mysql-test/suite/galera/t/galera_fulltext.test +++ b/mysql-test/suite/galera/t/galera_fulltext.test @@ -58,28 +58,50 @@ SELECT COUNT(f1) = 1000 FROM t1 WHERE MATCH(f1) AGAINST ('abcdefjhk'); DROP TABLE t1; DROP TABLE ten; - -# -# Case 2: UTF-8 -# TODO: MDEV-24978 # -#--connection node_1 -#SET @value=REPEAT (1,5001); -#CREATE TABLE t (a VARCHAR(5000),FULLTEXT (a)) engine=innodb DEFAULT CHARSET=utf8; -#INSERT IGNORE INTO t VALUES(@value); -#SELECT COUNT(*) FROM t; +# MDEV-24978 : SIGABRT in __libc_message # -#--connection node_2 -#SELECT COUNT(*) FROM t; -# -#--connection node_1 -#DROP TABLE t; -#CREATE TABLE t (a VARCHAR(5000)) engine=innodb DEFAULT CHARSET=utf8; -#INSERT IGNORE INTO t VALUES(@value); -#SELECT COUNT(*) FROM t; +--connection node_1 +SET @value=REPEAT (1,5001); +CREATE TABLE t (a VARCHAR(5000),FULLTEXT (a)) engine=innodb; +INSERT IGNORE INTO t VALUES(@value); +SELECT COUNT(*) FROM t; + +--connection node_2 +SELECT COUNT(*) FROM t; + +--connection node_1 +DROP TABLE t; +CREATE TABLE t (a VARCHAR(5000)) engine=innodb; +INSERT IGNORE INTO t VALUES(@value); +SELECT COUNT(*) FROM t; + +--connection node_2 +SELECT COUNT(*) FROM t; + +--connection node_1 +DROP TABLE t; + # -#--connection node_2 -#SELECT COUNT(*) FROM t; +# Case 2: UTF-8 # -#--connection node_1 -#DROP TABLE t; +--connection node_1 +SET @value=REPEAT (1,5001); +CREATE TABLE t (a VARCHAR(5000),FULLTEXT (a)) engine=innodb DEFAULT CHARSET=utf8; +INSERT IGNORE INTO t VALUES(@value); +SELECT COUNT(*) FROM t; + +--connection node_2 +SELECT COUNT(*) FROM t; + +--connection node_1 +DROP TABLE t; +CREATE TABLE t (a VARCHAR(5000)) engine=innodb DEFAULT CHARSET=utf8; +INSERT IGNORE INTO t VALUES(@value); +SELECT COUNT(*) FROM t; + +--connection node_2 +SELECT COUNT(*) FROM t; + +--connection node_1 +DROP TABLE t; diff --git a/mysql-test/suite/s3/mysqldump.result b/mysql-test/suite/s3/mysqldump.result index 1c5b3018e06..af9882615c3 100644 --- a/mysql-test/suite/s3/mysqldump.result +++ b/mysql-test/suite/s3/mysqldump.result @@ -24,7 +24,7 @@ CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1,1),(2,2),(3,3),(4,4); -ATER TABLE `t1` ENGINE=S3; +ALTER TABLE `t1` ENGINE=S3; ##### # mysqldump with --copy-s3-tables=1 XML ### diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc index 91b1a48cad7..67735972400 100644 --- a/sql/service_wsrep.cc +++ b/sql/service_wsrep.cc @@ -268,12 +268,11 @@ extern "C" my_bool wsrep_thd_order_before(const THD *left, const THD *right) extern "C" my_bool wsrep_thd_is_aborting(const MYSQL_THD thd) { mysql_mutex_assert_owner(&thd->LOCK_thd_data); - if (thd != 0) + + const wsrep::client_state& cs(thd->wsrep_cs()); + const enum wsrep::transaction::state tx_state(cs.transaction().state()); + switch (tx_state) { - const wsrep::client_state& cs(thd->wsrep_cs()); - const enum wsrep::transaction::state tx_state(cs.transaction().state()); - switch (tx_state) - { case wsrep::transaction::s_must_abort: return (cs.state() == wsrep::client_state::s_exec || cs.state() == wsrep::client_state::s_result); @@ -282,8 +281,8 @@ extern "C" my_bool wsrep_thd_is_aborting(const MYSQL_THD thd) return true; default: return false; - } } + return false; } diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index be69dd351f3..b5bc0c037ad 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -475,7 +475,7 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type, } bool log_on= (thd->variables.option_bits & OPTION_BIN_LOG); - if (global_system_variables.binlog_format == BINLOG_FORMAT_STMT && + if (thd->wsrep_binlog_format() == BINLOG_FORMAT_STMT && log_on && mysql_bin_log.is_open()) { /* diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 6c1b19446ce..27d8dd94af1 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -73,7 +73,8 @@ /* this is to get the bison compilation windows warnings out */ #ifdef _MSC_VER /* warning C4065: switch statement contains 'default' but no 'case' labels */ -#pragma warning (disable : 4065) +/* warning C4102: 'yyexhaustedlab': unreferenced label */ +#pragma warning (disable : 4065 4102) #endif #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wunused-label" /* yyexhaustedlab: */ diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index afa40f3d73a..d2185819225 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -6794,10 +6794,14 @@ wsrep_store_key_val_for_row( /* In a column prefix index, we may need to truncate the stored value: */ - if (true_len > key_len) { true_len = key_len; } + /* cannot exceed max column lenght either, we may need to truncate + the stored value: */ + if (true_len > sizeof(sorted)) { + true_len = sizeof(sorted); + } memcpy(sorted, data, true_len); true_len = wsrep_innobase_mysql_sort( @@ -6810,8 +6814,8 @@ wsrep_store_key_val_for_row( actual data. The rest of the space was reset to zero in the bzero() call above. */ if (true_len > buff_space) { - fprintf (stderr, - "WSREP: key truncated: %s\n", + WSREP_DEBUG ( + "write set key truncated for: %s\n", wsrep_thd_query(thd)); true_len = buff_space; } diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index 54919c260c8..3dd1b093cf6 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -540,6 +540,12 @@ static void trx_purge_cleanse_purge_queue(const fil_space_t& space) mysql_mutex_unlock(&purge_sys.pq_mutex); } +#if defined __GNUC__ && __GNUC__ == 4 && !defined __clang__ +# if defined __arm__ || defined __aarch64__ +/* Work around an internal compiler error in GCC 4.8.5 */ +__attribute__((optimize(0))) +# endif +#endif /** Removes unnecessary history data from rollback segments. NOTE that when this function is called, the caller must not have any latches on undo log pages! diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 8f4e2b2fdad..1a0cccf3bce 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -40,6 +40,8 @@ #include <arpa/inet.h> #endif +#include "my_valgrind.h" + static const my_bool my_true= 1; @@ -672,6 +674,11 @@ static void test_wl4435() /* Init PS-parameters. */ + memset(str_data, 0, sizeof str_data); + memset(dbl_data, 0, sizeof dbl_data); + memset(dec_data, 0, sizeof dec_data); + memset(int_data, 0, sizeof int_data); + bzero((char *) ps_params, sizeof (ps_params)); /* - v0 -- INT */ @@ -1072,7 +1079,7 @@ static void test_wl4435_2() MYSQL_RES *rs_metadata; \ MYSQL_FIELD *fields; \ c_type pspv c_type_ext; \ - my_bool psp_null; \ + my_bool psp_null= FALSE; \ \ bzero(&pspv, sizeof (pspv)); \ \ @@ -1133,6 +1140,7 @@ static void test_wl4435_3() { char tmp[255]; + memset(tmp, 0, sizeof tmp); puts(""); /* @@ -1631,6 +1639,7 @@ static void test_double_compare() my_bind[2].buffer= (void *)&double_data; tiny_data= 1; + memset(real_data, 0, sizeof real_data); strmov(real_data, "10.2"); double_data= 34.5; rc= mysql_stmt_bind_param(stmt, my_bind); @@ -7419,6 +7428,7 @@ static void test_decimal_bug() rc= mysql_stmt_bind_param(stmt, my_bind); check_execute(stmt, rc); + memset(data, 0, sizeof data); strmov(data, "8.0"); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -11571,6 +11581,7 @@ static void test_view_insert_fields() my_bind[i].is_null= 0; my_bind[i].buffer= (char *)&parm[i]; + memset(parm[i], 0, sizeof parm[i]); strmov(parm[i], "1"); my_bind[i].buffer_length= 2; my_bind[i].length= &l[i]; @@ -13168,6 +13179,7 @@ static void test_bug8330() check_execute(stmt[i], rc); my_bind[i].buffer_type= MYSQL_TYPE_LONG; + lval[i]= 0; my_bind[i].buffer= (void*) &lval[i]; my_bind[i].is_null= 0; mysql_stmt_bind_param(stmt[i], &my_bind[i]); @@ -15904,6 +15916,7 @@ static void test_bug20152() my_bind[0].buffer_type= MYSQL_TYPE_DATE; my_bind[0].buffer= (void*)&tm; + memset(&tm, 0, sizeof tm); tm.year = 2006; tm.month = 6; tm.day = 18; @@ -18939,6 +18952,7 @@ static void test_bug49972() in_param_bind.buffer_type= MYSQL_TYPE_LONG; in_param_bind.buffer= (char *) &int_data; + int_data= 0; in_param_bind.length= 0; in_param_bind.is_null= 0; @@ -19460,6 +19474,7 @@ static void test_ps_sp_out_params() DIE_UNLESS(mysql_stmt_param_count(stmt) == 1); memset(bind, 0, sizeof(MYSQL_BIND)); + memset(buffer, 0, sizeof buffer); bind[0].buffer= buffer; bind[0].buffer_length= sizeof(buffer); bind[0].buffer_type= MYSQL_TYPE_STRING; @@ -20135,6 +20150,7 @@ static void test_mdev14454_internal(const char *init, DIE_UNLESS(rc == 0); DIE_UNLESS(mysql_stmt_param_count(stmt) == 1); + memset(&bind, 0, sizeof bind); bind.buffer_type= MYSQL_TYPE_NULL; rc= mysql_stmt_bind_param(stmt, &bind); DIE_UNLESS(rc == 0); @@ -20143,7 +20159,6 @@ static void test_mdev14454_internal(const char *init, DIE_UNLESS(rc == 0); memset(res, 0, sizeof(res)); - memset(&bind, 0, sizeof(bind)); bind.buffer_type= MYSQL_TYPE_STRING; bind.buffer_length= sizeof(res); bind.buffer= res; @@ -20756,6 +20771,7 @@ static void test_ps_params_in_ctes() int_data[0]=2; + memset(ps_params, 0, sizeof ps_params); ps_params[0].buffer_type= MYSQL_TYPE_LONG; ps_params[0].buffer= (char *) &int_data[0]; ps_params[0].length= 0; @@ -21181,7 +21197,10 @@ static void test_explain_meta() } -#ifndef EMBEDDED_LIBRARY +#if __has_feature(memory_sanitizer) +/* FIXME: MDEV-26761: main.mysql_client_test fails with MemorySanitizer */ +#elif defined EMBEDDED_LIBRARY +#else #define MDEV19838_MAX_PARAM_COUNT 32 #define MDEV19838_FIELDS_COUNT 17 static void test_mdev19838() @@ -21802,7 +21821,10 @@ static struct my_tests_st my_tests[]= { #endif { "test_ps_params_in_ctes", test_ps_params_in_ctes }, { "test_explain_meta", test_explain_meta }, -#ifndef EMBEDDED_LIBRARY +#if __has_feature(memory_sanitizer) +/* FIXME: MDEV-26761: main.mysql_client_test fails with MemorySanitizer */ +#elif defined EMBEDDED_LIBRARY +#else { "test_mdev19838", test_mdev19838 }, #endif { "test_mdev18408", test_mdev18408 }, |