Merge 10.1 into 10.2

Temporarily disable a test for
commit 2175bfce
because fixing it in 10.2 requires updating libmariadb.

CMakeLists.txt

@@ -238,8 +238,14 @@ ENDIF()
 
 MY_CHECK_AND_SET_COMPILER_FLAG(-ggdb3 DEBUG)
 
-OPTION(ENABLED_LOCAL_INFILE
- "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
+SET(ENABLED_LOCAL_INFILE "AUTO" CACHE STRING "If we should should enable LOAD DATA LOCAL by default (OFF/ON/AUTO)")
+IF (ENABLED_LOCAL_INFILE MATCHES "^(0|FALSE)$")
+  SET(ENABLED_LOCAL_INFILE OFF)
+ELSEIF(ENABLED_LOCAL_INFILE MATCHES "^(1|TRUE)$")
+  SET(ENABLED_LOCAL_INFILE ON)
+ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
+  MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
+ENDIF()
 
 # Set DBUG_OFF and other optional release-only flags for non-debug project types
 FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)

client/mysqltest.cc

@@ -6090,7 +6090,6 @@ void do_connect(struct st_command *command)
 #endif
   if (opt_compress || con_compress)
     mysql_options(con_slot->mysql, MYSQL_OPT_COMPRESS, NullS);
-  mysql_options(con_slot->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
   mysql_options(con_slot->mysql, MYSQL_SET_CHARSET_NAME,
                 csname?csname: charset_info->csname);
   if (opt_charsets_dir)
@@ -6190,6 +6189,11 @@ void do_connect(struct st_command *command)
     if (con_slot == next_con)
       next_con++; /* if we used the next_con slot, advance the pointer */
   }
+  else // Failed to connect. Free the memory.
+  {
+    mysql_close(con_slot->mysql);
+    con_slot->mysql= NULL;
+  }
 
   dynstr_free(&ds_connection_name);
   dynstr_free(&ds_host);
@@ -9297,7 +9301,6 @@ int main(int argc, char **argv)
                   (void *) &opt_connect_timeout);
   if (opt_compress)
     mysql_options(con->mysql,MYSQL_OPT_COMPRESS,NullS);
-  mysql_options(con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
   mysql_options(con->mysql, MYSQL_SET_CHARSET_NAME,
                 charset_info->csname);
   if (opt_charsets_dir)

cmake/build_configurations/mysql_release.cmake

@@ -86,7 +86,6 @@ IF(FEATURE_SET)
   ENDIF()
 ENDIF()
 
-OPTION(ENABLED_LOCAL_INFILE "" ON)
 SET(WITH_INNODB_SNAPPY OFF CACHE STRING "")
 IF(WIN32)
   SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "")

cmake/ssl.cmake

@@ -128,11 +128,6 @@ MACRO (MYSQL_CHECK_SSL)
     FIND_PACKAGE(OpenSSL)
     IF(OPENSSL_FOUND)
       SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
-      INCLUDE(CheckSymbolExists)
-      SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-      CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h"
-                          HAVE_SHA512_DIGEST_LENGTH)
-      SET(CMAKE_REQUIRED_INCLUDES)
       SET(SSL_SOURCES "")
       SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
       IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")

config.h.cmake

@@ -453,7 +453,11 @@
 /*
   MySQL features
 */
-#cmakedefine ENABLED_LOCAL_INFILE 1
+#define LOCAL_INFILE_MODE_OFF  0
+#define LOCAL_INFILE_MODE_ON   1
+#define LOCAL_INFILE_MODE_AUTO 2
+#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_@ENABLED_LOCAL_INFILE@
+
 #cmakedefine ENABLED_PROFILING 1
 #cmakedefine EXTRA_DEBUG 1
 #cmakedefine USE_SYMDIR 1

include/my_valgrind.h

@@ -42,7 +42,7 @@
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
 #else
-# define MEM_UNDEFINED(a,len) ((void) 0)
+# define MEM_UNDEFINED(a,len) ((void) (a), (void) (len))
 # define MEM_NOACCESS(a,len) ((void) 0)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
@@ -51,7 +51,7 @@
 #ifndef DBUG_OFF
 #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); MEM_UNDEFINED(A, trash_tmp); memset(A, C, trash_tmp); } while (0)
 #else
-#define TRASH_FILL(A,B,C) do { const size_t trash_tmp __attribute__((unused))= (B); MEM_UNDEFINED(A,trash_tmp); } while (0)
+#define TRASH_FILL(A,B,C) do { MEM_UNDEFINED((A), (B)); } while (0)
 #endif
 
 #define TRASH_ALLOC(A,B) do { TRASH_FILL(A,B,0xA5); MEM_UNDEFINED(A,B); } while(0)

include/mysql.h

@@ -294,7 +294,7 @@ typedef struct st_mysql
 
   /* session-wide random string */
   char	        scramble[SCRAMBLE_LENGTH+1];
-  my_bool unused1;
+  my_bool       auto_local_infile;
   void *unused2, *unused3, *unused4, *unused5;
 
   LIST  *stmts;                     /* list of all statements */

include/mysql.h.pp

@@ -378,7 +378,7 @@ typedef struct st_mysql
   my_bool free_me;
   my_bool reconnect;
   char scramble[20 +1];
-  my_bool unused1;
+  my_bool auto_local_infile;
   void *unused2, *unused3, *unused4, *unused5;
   LIST *stmts;
   const struct st_mysql_methods *methods;

mysql-test/disabled.def

@@ -21,3 +21,4 @@ innodb-wl5522-debug-zip  : broken upstream
 innodb_bug12902967       : broken upstream
 file_contents            : MDEV-6526 these files are not installed anymore
 max_statement_time       : cannot possibly work, depends on timing
+partition_open_files_limit : open_files_limit check broken by MDEV-18360

mysql-test/r/lowercase_fs_off.test

-#
-# Specific tests for case sensitive file systems
-# i.e. lower_case_filesystem=OFF
-#
--- source include/have_case_sensitive_file_system.inc
--- source include/not_embedded.inc
-
-connect (master,localhost,root,,);
-connection master;
-create database d1;
-grant all on d1.* to 'sample'@'localhost' identified by 'password';
-flush privileges;
-
-connect (sample,localhost,sample,password,d1);
-connection sample;
-select database();
---error ER_DBACCESS_DENIED_ERROR
-create database d2;
---error ER_DBACCESS_DENIED_ERROR
-create database D1;
-disconnect sample;
---source include/wait_until_disconnected.inc
-
-connection master;
-drop user 'sample'@'localhost';
-drop database if exists d1;
-disconnect master;
---source include/wait_until_disconnected.inc
-connection default;
-
-# End of 4.1 tests
-
-#
-# Bug#41049 does syntax "grant" case insensitive?
-#
-CREATE DATABASE d1;
-USE d1;
-CREATE TABLE T1(f1 INT);
-CREATE TABLE t1(f1 INT);
-GRANT SELECT ON T1 to user_1@localhost;
-
-connect (con1,localhost,user_1,,d1);
---error ER_TABLEACCESS_DENIED_ERROR
-select * from t1;
-select * from T1;
-connection default;
-GRANT SELECT ON t1 to user_1@localhost;
-connection con1;
-select * from information_schema.table_privileges;
-connection default;
-disconnect con1;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1@localhost;
-DROP USER user_1@localhost;
-DROP DATABASE d1;
-USE test;
-
-CREATE DATABASE db1;
-USE db1;
-CREATE PROCEDURE p1() BEGIN END;
-CREATE FUNCTION f1(i INT) RETURNS INT RETURN i+1;
-
-GRANT USAGE ON db1.* to user_1@localhost;
-GRANT EXECUTE ON PROCEDURE db1.P1 to user_1@localhost;
-GRANT EXECUTE ON FUNCTION db1.f1 to user_1@localhost;
-GRANT UPDATE ON db1.* to USER_1@localhost;
-
-connect (con1,localhost,user_1,,db1);
-call p1();
-call P1();
-select f1(1);
-connect (con2,localhost,USER_1,,db1);
---error ER_PROCACCESS_DENIED_ERROR
-call p1();
---error ER_PROCACCESS_DENIED_ERROR
-call P1();
---error ER_PROCACCESS_DENIED_ERROR
-select f1(1);
-
-connection default;
-disconnect con1;
-disconnect con2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1@localhost;
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM USER_1@localhost;
-DROP FUNCTION f1;
-DROP PROCEDURE p1;
-DROP USER user_1@localhost;
-DROP USER USER_1@localhost;
-DROP DATABASE db1;
-use test;
-
-# End of 5.0 tests
-
-
---echo #
---echo # Extra test coverage for Bug#56595 RENAME TABLE causes assert on OS X
---echo #
-
-CREATE TABLE t1(a INT);
-CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a= 1;
-RENAME TABLE t1 TO T1;
-ALTER TABLE T1 RENAME t1;
-DROP TABLE t1;
-
-#
-# MDEV-13912 mysql_upgrade: case (in)sensitivity for stored procedures
-#
-create database TEST;
-create procedure TEST.pr() begin end;
-create procedure test.pr() begin end;
---exec $MYSQL_UPGRADE --force 2>&1
-drop procedure test.pr;
-drop database TEST;
-
-# End of 5.5 tests
-
-#
-# MDEV-9014 SHOW TRIGGERS not case sensitive
-#
-create table t1 (a int);
-create trigger t1_bi before insert on t1 for each row set new.a= 1;
-show triggers like '%T1%';
-drop table t1;

mysql-test/r/mysql.result

@@ -600,3 +600,18 @@ a
 2
 drop table "a1\""b1";
 set sql_mode=default;
+create table t1 (a text);
+select count(*) from t1;
+count(*)
+41
+truncate table t1;
+select count(*) from t1;
+count(*)
+41
+truncate table t1;
+select count(*) from t1;
+count(*)
+0
+truncate table t1;
+### FIXME: update libmariadb
+drop table t1;

mysql-test/r/row-checksum-old.result

@@ -83,3 +83,19 @@ checksum table t1 extended;
 Table	Checksum
 test.t1	452555338
 drop table t1;
+#
+# MDEV-17085: CHECKSUM TABLE EXTENDED does not work correctly
+#
+CREATE TABLE t1 ( c1 int NOT NULL, c2 int NOT NULL, c4 varchar(20), c5 varchar(20), c6 varchar(20), c7 varchar(20), c8 varchar(20), c9 varchar(20), c10 varchar(20), c11 varchar(20), c12 varchar(20), c13 varchar(20), c14 varchar(20), c15 varchar(20), c16 varchar(20), c19 int NOT NULL, c20 int NOT NULL, c21 varchar(20), c22 VARCHAR(20), c23 varchar(20));
+insert into t1 values (5,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,"dog",NULL,NULL);
+# Important is that checksum is different from following
+CHECKSUM TABLE t1 EXTENDED;
+Table	Checksum
+test.t1	2514025256
+UPDATE t1 SET c21='cat' WHERE  c1=5;
+# Important is that checksum is different from above
+CHECKSUM TABLE t1 EXTENDED;
+Table	Checksum
+test.t1	2326430205
+drop table t1;
+# End of 5.5 tests

mysql-test/r/row-checksum.result

@@ -83,3 +83,19 @@ checksum table t1 extended;
 Table	Checksum
 test.t1	229851577
 drop table t1;
+#
+# MDEV-17085: CHECKSUM TABLE EXTENDED does not work correctly
+#
+CREATE TABLE t1 ( c1 int NOT NULL, c2 int NOT NULL, c4 varchar(20), c5 varchar(20), c6 varchar(20), c7 varchar(20), c8 varchar(20), c9 varchar(20), c10 varchar(20), c11 varchar(20), c12 varchar(20), c13 varchar(20), c14 varchar(20), c15 varchar(20), c16 varchar(20), c19 int NOT NULL, c20 int NOT NULL, c21 varchar(20), c22 VARCHAR(20), c23 varchar(20));
+insert into t1 values (5,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,"dog",NULL,NULL);
+# Important is that checksum is different from following
+CHECKSUM TABLE t1 EXTENDED;
+Table	Checksum
+test.t1	2514025256
+UPDATE t1 SET c21='cat' WHERE  c1=5;
+# Important is that checksum is different from above
+CHECKSUM TABLE t1 EXTENDED;
+Table	Checksum
+test.t1	2326430205
+drop table t1;
+# End of 5.5 tests

mysql-test/r/subselect2.result

@@ -394,3 +394,25 @@ select null in (select a from t1 where a < out3.a union select a from t2 where
 (select a from t3) +1 < out3.a+1) from t3 out3;
 ERROR 21000: Subquery returns more than 1 row
 drop table t1, t2, t3;
+CREATE TABLE t1(
+q11 int, q12 int, q13 int, q14 int, q15 int, q16 int, q17 int, q18 int, q19 int,
+q21 int, q22 int, q23 int, q24 int, q25 int, q26 int, q27 int, q28 int, q29 int,
+f1 int
+);
+CREATE TABLE t2(f2 int, f21 int, f3 timestamp, f4 int, f5 int, f6 int);
+INSERT INTO t1 (f1) VALUES (1),(1),(2),(2);
+INSERT INTO t2 VALUES (1,1,"2004-02-29 11:11:11",0,0,0), (2,2,"2004-02-29 11:11:11",0,0,0);
+SELECT f1,
+(SELECT t.f21 from t2 t where max(
+q11+q12+q13+q14+q15+q16+q17+q18+q19+
+q21+q22+q23+q24+q25+q26+q27+q28+q29) = t.f2 UNION
+SELECT t.f3 FROM t2 AS t WHERE t1.f1=t.f2 AND t.f3=MAX(t1.f1) UNION
+SELECT 1 LIMIT 1) AS test
+FROM t1 GROUP BY f1;
+f1	test
+1	1
+2	1
+Warnings:
+Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Incorrect datetime value: '2'
+DROP TABLE t1,t2;

mysql-test/r/subselect_mat.result

@@ -2865,6 +2865,22 @@ SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
 f
 DROP TABLE t1, t2;
 #
+# MDEV-18255: Server crashes in Bitmap<64u>::intersect
+#
+create table t1 (v1 varchar(1)) engine=myisam ;
+create table t2 (v1 varchar(1)) engine=myisam ;
+explain
+select 1 from t1 where exists
+(select 1 from t1 where t1.v1 in (select t2.v1 from t2 having t2.v1 < 'j')) ;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+3	MATERIALIZED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+select 1 from t1 where exists
+(select 1 from t1 where t1.v1 in (select t2.v1 from t2 having t2.v1 < 'j')) ;
+1
+drop table t1,t2;
+#
 # MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
 # UNION ALL
 #

mysql-test/suite/innodb/r/alter_foreign_crash.result

@@ -21,6 +21,6 @@ Tables_in_bug
 parent
 alter table parent row_format=dynamic;
 Warnings:
-Warning	1088	InnoDB: Could not add foreign key constraints.
+Warning	1088	failed to load FOREIGN KEY constraints
 drop table parent;
 drop database bug;

mysql-test/suite/innodb/r/foreign_key.result

@@ -206,6 +206,39 @@ connection default;
 ERROR 70100: Query execution was interrupted
 disconnect fk;
 DROP TABLE t3,t1;
+#
+# MDEV-18222 InnoDB: Failing assertion: heap->magic_n == MEM_BLOCK_MAGIC_N
+# or ASAN heap-use-after-free in dict_foreign_remove_from_cache upon CHANGE COLUMN
+#
+CREATE TABLE t1 (a INT, UNIQUE(a), KEY(a)) ENGINE=InnoDB;
+ALTER TABLE t1 ADD FOREIGN KEY (a) REFERENCES t1 (a);
+SET SESSION FOREIGN_KEY_CHECKS = OFF;
+ALTER TABLE t1 CHANGE COLUMN a a TIME NOT NULL;
+ALTER TABLE t1 ADD pk INT NOT NULL AUTO_INCREMENT PRIMARY KEY;
+ALTER TABLE t1 CHANGE COLUMN a b TIME;
+SET SESSION FOREIGN_KEY_CHECKS = ON;
+DROP TABLE t1;
+#
+# MDEV-18256 InnoDB: Failing assertion: heap->magic_n == MEM_BLOCK_MAGIC_N
+# upon DROP FOREIGN KEY
+#
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t2 (b INT PRIMARY KEY, FOREIGN KEY fk1 (b) REFERENCES t1 (a))
+ENGINE=InnoDB;
+ALTER TABLE t2 DROP FOREIGN KEY fk1, DROP FOREIGN KEY fk1;
+DROP TABLE t2, t1;
+CREATE TABLE t1 (f VARCHAR(256)) ENGINE=InnoDB;
+SET SESSION FOREIGN_KEY_CHECKS = OFF;
+ALTER TABLE t1 ADD FOREIGN KEY (f) REFERENCES non_existing_table (x);
+SET SESSION FOREIGN_KEY_CHECKS = ON;
+ALTER TABLE t1 ADD FULLTEXT INDEX ft1 (f);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+Warning	1088	failed to load FOREIGN KEY constraints
+ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
+Warnings:
+Warning	1088	failed to load FOREIGN KEY constraints
+DROP TABLE t1;
 # Start of 10.2 tests
 #
 # MDEV-13246 Stale rows despite ON DELETE CASCADE constraint

storage/tokudb/mysql-test/tokudb_bugs/r/PS-4979.result

+CREATE TABLE `#mysql50#q.q`(f1 INT KEY) ENGINE=TOKUDB;
+ERROR 42000: Incorrect table name '#mysql50#q.q'