New upstream version 10.1.35

mysql-test/suite/plugins/t/processlist.test

@@ -8,10 +8,12 @@ start transaction;
 insert t1 values (1);
 let id=`select connection_id()`;
 connect con2,localhost,root;
-let s=query_get_value(show engine innodb status,Status,1);
+let $wait_condition=select state='' from information_schema.processlist where id = $id;
+--source include/wait_condition.inc
+replace_regex /\"/-/; #"
+let s=`show engine innodb status`;
 disable_query_log;
-eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status`;
-eval select state as `state from show processlist` from information_schema.processlist where id = $id;
+eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status, must be empty`;
 enable_query_log;
 disconnect con2;
 connection default;

mysql-test/suite/rpl/r/rpl_parallel_optimistic.result

 include/rpl_init.inc [topology=1->2]
-call mtr.add_suppression("Warning.*Deadlock found when trying to get lock; try restarting transaction");
-call mtr.add_suppression("Warning.*mysqld: Can't find record in 't2'");
 ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
 CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
 SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
@@ -549,6 +547,7 @@ DELETE FROM t1;
 DELETE FROM t2;
 include/save_master_gtid.inc
 include/sync_with_master_gtid.inc
+set global log_warnings=2;
 BEGIN;
 INSERT INTO t1 SET a=1;
 SET @save.binlog_format=@@session.binlog_format;
@@ -567,6 +566,7 @@ DELETE FROM t2;
 include/save_master_gtid.inc
 include/sync_with_master_gtid.inc
 include/stop_slave.inc
+set global log_warnings=default;
 SET GLOBAL slave_parallel_mode=@old_parallel_mode;
 SET GLOBAL slave_parallel_threads=@old_parallel_threads;
 include/start_slave.inc

mysql-test/suite/rpl/t/rpl_parallel_optimistic.test

@@ -4,11 +4,6 @@
 --let $rpl_topology=1->2
 --source include/rpl_init.inc
 
---connection server_2
-call mtr.add_suppression("Warning.*Deadlock found when trying to get lock; try restarting transaction");
-# The following instruction is a part of the proof of MDEV-13577 fixes, below.
-call mtr.add_suppression("Warning.*mysqld: Can't find record in 't2'");
-
 --connection server_1
 ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
 CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
@@ -500,6 +495,7 @@ DELETE FROM t2;
 
 # The 1st of the following two trx:s a blocker on slave
 --connection server_2
+set global log_warnings=2;
 BEGIN;
 INSERT INTO t1 SET a=1;
 
@@ -546,6 +542,7 @@ DELETE FROM t2;
 #
 --connection server_2
 --source include/stop_slave.inc
+set global log_warnings=default;
 SET GLOBAL slave_parallel_mode=@old_parallel_mode;
 SET GLOBAL slave_parallel_threads=@old_parallel_threads;
 --source include/start_slave.inc

mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff

@@ -1210,7 +1210,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
--GLOBAL_VALUE	5.6.40
+-GLOBAL_VALUE	5.6.41
 +GLOBAL_VALUE	5.6.39-83.1
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL

mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff

---- suite/sys_vars/r/sysvars_innodb.result
-+++ suite/sys_vars/r/sysvars_innodb,xtradb.reject
+--- mysql-test/suite/sys_vars/r/sysvars_innodb.result	2018-07-30 23:41:05.030930072 +0200
++++ mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.reject	2018-07-31 09:45:20.330811949 +0200
 @@ -47,6 +47,20 @@
  ENUM_VALUE_LIST	OFF,ON
  READ_ONLY	NO
@@ -684,7 +684,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
--GLOBAL_VALUE	5.6.40
+-GLOBAL_VALUE	5.6.41
 +GLOBAL_VALUE	5.6.39-83.1
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL

mysql-test/suite/sys_vars/r/sysvars_innodb.result

@@ -2401,7 +2401,7 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_VERSION
 SESSION_VALUE	NULL
-GLOBAL_VALUE	5.6.40
+GLOBAL_VALUE	5.6.41
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

@@ -471,6 +471,20 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	CORE_FILE
+SESSION_VALUE	NULL
+GLOBAL_VALUE	ON
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	NULL
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	write a core-file on crashes
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	DATADIR
 SESSION_VALUE	NULL
 GLOBAL_VALUE	PATH

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@@ -471,6 +471,20 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	CORE_FILE
+SESSION_VALUE	NULL
+GLOBAL_VALUE	ON
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	NULL
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	write a core-file on crashes
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	DATADIR
 SESSION_VALUE	NULL
 GLOBAL_VALUE	PATH

mysql-test/suite/unit/suite.pm

@@ -37,10 +37,11 @@ sub start_test {
 }
 
 { 
+  my $bin=$ENV{MTR_BINDIR} || '..';
   return "Not run for embedded server" if $::opt_embedded_server;
-  return "Not configured to run ctest" unless -f "../CTestTestfile.cmake";
-  my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : "";
-  my (@ctest_list)= `cd .. && ctest $opt_vs_config -E MTR -C default_ignore --show-only --verbose`;
+  return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake";
+  my ($ctest_vs)= $::opt_vs_config ? "-C ".substr($::opt_vs_config,1) : "";
+  my (@ctest_list)= `cd $bin && ctest $ctest_vs --show-only --verbose`;
   return "No ctest" if $?;
 
   my ($command, %tests);

mysql-test/suite/vcol/r/vcol_misc.result

@@ -354,6 +354,16 @@ a	b	c
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 #
+# MDEV-15834 The code in TABLE_SHARE::init_from_binary_frm_image() is not safe
+#
+SHOW TABLES;
+Tables_in_test
+t1
+SHOW CREATE TABLE t1;
+ERROR HY000: Incorrect information in file: './test/t1.frm'
+ALTER TABLE t1;
+ERROR HY000: Incorrect information in file: './test/t1.frm'
+#
 # End of 5.5 tests
 #
 #

mysql-test/suite/vcol/t/vcol_misc.test

 --source include/have_ucs2.inc
 
+let $MYSQLD_DATADIR= `select @@datadir`;
+
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings
@@ -318,6 +320,22 @@ SELECT * FROM t1;
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 
+
+--echo #
+--echo # MDEV-15834 The code in TABLE_SHARE::init_from_binary_frm_image() is not safe
+--echo #
+
+--copy_file std_data/frm/t1.frm $MYSQLD_DATADIR/test/t1.frm
+SHOW TABLES;
+--replace_result $MYSQLD_DATADIR ./
+--error ER_NOT_FORM_FILE
+SHOW CREATE TABLE t1;
+--replace_result $MYSQLD_DATADIR ./
+--error ER_NOT_FORM_FILE
+ALTER TABLE t1;
+--remove_file $MYSQLD_DATADIR/test/t1.frm
+
+
 --echo #
 --echo # End of 5.5 tests
 --echo #

mysql-test/t/auto_increment.test

@@ -397,3 +397,28 @@ insert into t1 values(null);
 select last_insert_id();
 select * from t1;
 drop table t1;
+
+
+--echo #
+--echo # Start of 5.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-16534 PPC64: Unexpected error with a negative values into auto-increment columns in HEAP, MyISAM, ARIA
+--echo #
+
+CREATE TABLE t1 (
+  id TINYINT NOT NULL AUTO_INCREMENT,
+  name CHAR(30) NOT NULL,
+  PRIMARY KEY (id)
+) ENGINE=MyISAM;
+SHOW CREATE TABLE t1;
+INSERT INTO t1 (name) VALUES ('dog');
+UPDATE t1 SET id=-1 WHERE id=1;
+INSERT INTO t1 (name) VALUES ('cat');
+SELECT * FROM t1;
+DROP TABLE t1;
+
+--echo #
+--echo # End of 5.5 tests
+--echo #

mysql-test/t/bootstrap.test

@@ -106,3 +106,12 @@ use test;
 EOF
 --exec $MYSQLD_BOOTSTRAP_CMD --ignore-db-dirs='some_dir' --ignore-db-dirs='some_dir' < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
 --remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
+
+#
+# MDEV-13397 MariaDB upgrade fail when using default_time_zone
+#
+--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
+use test;
+EOF
+--exec $MYSQLD_BOOTSTRAP_CMD --default-time-zone=Europe/Moscow < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql

mysql-test/t/ctype_binary.test

@@ -24,6 +24,9 @@ SET NAMES binary;
 --echo #
 SELECT _binary 0x7E, _binary X'7E', _binary B'01111110';
 
+SET NAMES utf8, character_set_connection=binary;
+--source include/ctype_mdev13118.inc
+
 --echo #
 --echo # End of 10.0 tests
 --echo #

mysql-test/t/ctype_eucjpms.test

@@ -537,6 +537,8 @@ DROP TABLE t1;
 --error ER_INVALID_CHARACTER_STRING
 SELECT _eucjpms 0x8EA0;
 
+SET NAMES eucjpms;
+--source include/ctype_mdev13118.inc
 
 --echo #
 --echo # End of 10.0 tests

mysql-test/t/ctype_euckr.test

@@ -197,3 +197,14 @@ set collation_connection=euckr_bin;
 --echo # End of 5.6 tests
 --echo #
 
+
+--echo #
+--echo # Start of 10.0 tests
+--echo #
+
+SET NAMES utf8, character_set_connection=euckr;
+--source include/ctype_mdev13118.inc
+
+--echo #
+--echo # End of 10.0 tests
+--echo #

mysql-test/t/ctype_gbk.test

@@ -199,6 +199,9 @@ let $ctype_unescape_combinations=selected;
 SET NAMES gbk;
 --source include/ctype_E05C.inc
 
+SET NAMES utf8, character_set_connection=gbk;
+--source include/ctype_mdev13118.inc
+
 --echo #
 --echo # MDEV-9886 Illegal mix of collations with a view comparing a field to a binary constant
 --echo #

mysql-test/t/ctype_latin1.test

@@ -260,6 +260,9 @@ SELECT * FROM v1;
 DROP VIEW v1;
 DROP TABLE t1;
 
+SET NAMES latin1;
+--source include/ctype_mdev13118.inc
+
 
 --echo #
 --echo # End of 10.0 tests

mysql-test/t/ctype_ucs.test

@@ -988,6 +988,10 @@ DROP TABLE t1;
 SET optimizer_switch=@save_optimizer_switch;
 
 
+SET NAMES utf8, character_set_connection=ucs2;
+--source include/ctype_mdev13118.inc
+
+
 --echo #
 --echo # End of 10.0 tests
 --echo #

mysql-test/t/ctype_ujis.test

@@ -1368,6 +1368,10 @@ DROP TABLE t1;
 SELECT _ujis 0x8EA0;
 
 
+SET NAMES ujis;
+--source include/ctype_mdev13118.inc
+
+
 --echo #
 --echo # End of 10.0 tests
 --echo #