Merge 10.1 into 10.2

include/my_valgrind.h

@@ -35,6 +35,8 @@
 # define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
 #elif defined(__SANITIZE_ADDRESS__)
 # include <sanitizer/asan_interface.h>
+/* How to do manual poisoning:
+https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */
 # define MEM_UNDEFINED(a,len) ASAN_UNPOISON_MEMORY_REGION(a,len)
 # define MEM_NOACCESS(a,len) ASAN_POISON_MEMORY_REGION(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)

mysql-test/r/having.result

@@ -721,6 +721,20 @@ SELECT * FROM t1 JOIN t2 ON c1 = c2 HAVING c2 > 'a' ORDER BY c2 LIMIT 1;
 c1	c2
 x	x
 DROP TABLE t1,t2;
+#
+# MDEV-6736: Valgrind warnings 'Invalid read' in subselect_engine::calc_const_tables with SQ 
+# in WHERE and HAVING, ORDER BY, materialization+semijoin
+#
+CREATE TABLE t1 (a INT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (3),(8);
+CREATE TABLE t2 (b INT) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (2),(1);
+SELECT a FROM t1
+WHERE 9 IN ( SELECT MIN( a ) FROM t1 )
+HAVING a <> ( SELECT COUNT(*) FROM t2 ) 
+ORDER BY a;
+a
+DROP TABLE t1,t2;
 End of 10.0 tests
 #
 # MDEV-10716: Assertion `real_type() != FIELD_ITEM' failed in

mysql-test/suite/engines/iuds/r/update_time.result

@@ -1215,7 +1215,7 @@ c1	c2
 838:59:59	838:59:59
 UPDATE IGNORE t1 SET t1.c2='99999.99999' WHERE c1 BETWEEN 080000 AND 100000;
 Warnings:
-Warning	1265	Data truncated for column 'c2' at row 1
+Warning	1265	Data truncated for column 'c2' at row N
 SELECT * FROM t1;
 c1	c2
 -12:12:12	12:12:12

mysql-test/suite/engines/iuds/t/update_time.test

@@ -172,6 +172,7 @@ SELECT * FROM t1;
 
 # Update using range
 # EXPLAIN SELECT * FROM t1 WHERE c1 BETWEEN 080000 AND 100000;
+--replace_regex /(Data truncated for column 'c2' at row) [1-9][0-9]*/\1 N/
 UPDATE IGNORE t1 SET t1.c2='99999.99999' WHERE c1 BETWEEN 080000 AND 100000;
 --sorted_result
 SELECT * FROM t1;

mysql-test/suite/galera/disabled.def

@@ -56,3 +56,4 @@ galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read tr
 galera_gtid : MDEV-13549 Galera test failures 10.1
 galera_gtid_slave : MDEV-13549 Galera test failures 10.1
 galera_unicode_identifiers : MDEV-13549 Galera test failures 10.1
+galera.galera_gcs_fc_limit : MDEV-13549 Galera test failures 10.1

mysql-test/suite/galera/t/galera_var_reject_queries.test

@@ -23,7 +23,7 @@ SELECT * FROM t1;
 SET GLOBAL wsrep_reject_queries = ALL_KILL;
 
 --connection node_1a
---error ER_CONNECTION_KILLED,2013
+--error ER_CONNECTION_KILLED,2013,2006
 SELECT * FROM t1;
 
 --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1

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

@@ -41,6 +41,9 @@ SHOW TABLE STATUS LIKE 'tab';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 tab	InnoDB	#	Compact	#	#	#	#	#	#	NULL	#	NULL	NULL	latin1_swedish_ci	NULL		
 ALTER TABLE tab DISCARD TABLESPACE;
+call mtr.add_suppression("InnoDB: Tried to read .* bytes at offset 0");
+ALTER TABLE tab IMPORT TABLESPACE;
+ERROR HY000: Internal error: Cannot reset LSNs in table `test`.`tab` : I/O error
 ALTER TABLE tab IMPORT TABLESPACE;
 SELECT * FROM tab;
 a

mysql-test/suite/innodb/t/default_row_format_compatibility.test

@@ -81,7 +81,14 @@ SHOW TABLE STATUS LIKE 'tab';
 ALTER TABLE tab DISCARD TABLESPACE;
 
 # Move the *ibd,*.cfg file into orginal location
+--copy_file $MYSQLD_DATADIR/tab.cfg $MYSQLD_DATADIR/test/tab.ibd
 --move_file $MYSQLD_DATADIR/tab.cfg $MYSQLD_DATADIR/test/tab.cfg
+
+call mtr.add_suppression("InnoDB: Tried to read .* bytes at offset 0");
+
+--error ER_INTERNAL_ERROR
+ALTER TABLE tab IMPORT TABLESPACE;
+--remove_file $MYSQLD_DATADIR/test/tab.ibd
 --move_file $MYSQLD_DATADIR/tab.ibd $MYSQLD_DATADIR/test/tab.ibd
 
 # Check import is successful (because same row_format)

mysql-test/suite/plugins/r/disks.result

@@ -0,0 +1,14 @@
+install plugin DISKS soname 'disks';
+show create table information_schema.disks;
+Table	Create Table
+DISKS	CREATE TEMPORARY TABLE `DISKS` (
+  `Disk` varchar(4096) NOT NULL DEFAULT '',
+  `Path` varchar(4096) NOT NULL DEFAULT '',
+  `Total` int(32) NOT NULL DEFAULT 0,
+  `Used` int(32) NOT NULL DEFAULT 0,
+  `Available` int(32) NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
+sum(Total) > sum(Available)	sum(Total)>sum(Used)
+1	1
+uninstall plugin DISKS;

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

@@ -0,0 +1,11 @@
+--source include/not_windows.inc
+
+if (!$DISKS_SO) {
+  skip No DISKS plugin;
+}
+
+install plugin DISKS soname 'disks';
+show create table information_schema.disks;
+select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
+
+uninstall plugin DISKS;

mysql-test/t/having.test

@@ -759,6 +759,24 @@ SELECT * FROM t1 JOIN t2 ON c1 = c2 HAVING c2 > 'a' ORDER BY c2 LIMIT 1;
 
 DROP TABLE t1,t2;
 
+--echo #
+--echo # MDEV-6736: Valgrind warnings 'Invalid read' in subselect_engine::calc_const_tables with SQ 
+--echo # in WHERE and HAVING, ORDER BY, materialization+semijoin
+--echo #
+
+CREATE TABLE t1 (a INT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (3),(8);
+
+CREATE TABLE t2 (b INT) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (2),(1);
+
+SELECT a FROM t1
+WHERE 9 IN ( SELECT MIN( a ) FROM t1 )
+HAVING a <> ( SELECT COUNT(*) FROM t2 ) 
+ORDER BY a;
+
+DROP TABLE t1,t2;
+
 --echo End of 10.0 tests
 
 --echo #

plugin/information_schema_disks/CMakeLists.txt

@@ -0,0 +1,5 @@
+IF(NOT WIN32)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql)
+  MYSQL_ADD_PLUGIN(DISKS information_schema_disks.cc MODULE_ONLY RECOMPILE_FOR_EMBEDDED)
+ENDIF()
+

plugin/information_schema_disks/README.txt

@@ -0,0 +1,101 @@
+Information Schema Disks
+------------------------
+This is a proof-of-concept information schema plugin that allows the
+disk space situation to be monitored. When installed, it can be used
+as follows:
+
+  > select * from information_schema.disks;
+  +-----------+-----------------------+-----------+----------+-----------+
+  | Disk      | Path                  | Total     | Used     | Available |
+  +-----------+-----------------------+-----------+----------+-----------+
+  | /dev/sda3 | /                     |  47929956 | 30666304 |  14805864 |
+  | /dev/sda1 | /boot/efi             |    191551 |     3461 |    188090 |
+  | /dev/sda4 | /home                 | 174679768 | 80335392 |  85448120 |
+  | /dev/sdb1 | /mnt/hdd              | 961301832 |    83764 | 912363644 |
+  | /dev/sdb1 | /home/wikman/Music    | 961301832 |    83764 | 912363644 |
+  | /dev/sdb1 | /home/wikman/Videos   | 961301832 |    83764 | 912363644 |
+  | /dev/sdb1 | /home/wikman/hdd      | 961301832 |    83764 | 912363644 |
+  | /dev/sdb1 | /home/wikman/Pictures | 961301832 |    83764 | 912363644 |
+  | /dev/sda3 | /var/lib/docker/aufs  |  47929956 | 30666304 |  14805864 |
+  +-----------+-----------------------+-----------+----------+-----------+
+  9 rows in set (0.00 sec)
+
+- 'Disk' is the name of the disk itself.
+- 'Path' is the mount point of the disk.
+- 'Total' is the total space in KiB.
+- 'Used' is the used amount of space in KiB, and
+- 'Available' is the amount of space in KiB available to non-root users.
+
+Note that as the amount of space available to root may be more that what
+is available to non-root users, 'available' + 'used' may be less than 'total'.
+
+All paths to which a particular disk has been mounted are reported. The
+rationale is that someone might want to take different action e.g. depending
+on which disk is relevant for a particular path. This leads to the same disk
+being reported multiple times. An alternative to this would be to have two
+tables; disks and mounts.
+
+  > select * from information_schema.disks;
+  +-----------+-----------+----------+-----------+
+  | Disk      | Total     | Used     | Available |
+  +-----------+-----------+----------+-----------+
+  | /dev/sda3 |  47929956 | 30666304 |  14805864 |
+  | /dev/sda1 |    191551 |     3461 |    188090 |
+  | /dev/sda4 | 174679768 | 80335392 |  85448120 |
+  | /dev/sdb1 | 961301832 |    83764 | 912363644 |
+  +-----------+-----------+----------+-----------+
+
+  > select * from information_schema.mounts;
+  +-----------------------+-----------+
+  | Path                  | Disk      |
+  +-----------------------+-----------+
+  | /                     | /dev/sda3 |
+  | /boot/efi             | /dev/sda1 |
+  | /home                 | /dev/sda4 |
+  | /mnt/hdd              | /dev/sdb1 |
+  | /home/wikman/Music    | /dev/sdb1 |
+  ...
+
+
+Building
+--------
+- Ensure that the directory information_schema_disks is in the top-level
+  directory of the server.
+- Add
+
+  ADD_SUBDIRECTORY(information_schema_disks)
+
+  to the top-level CMakeLists.txt
+
+> Invoke make
+
+  $ make
+
+Installation
+------------
+- Copy information_schema_disks/libinformation_schema_disks.so to the plugin
+  directory of the server:
+
+  $ cd information_schema_disks
+  $ sudo cp libinformation_schema_disks.so plugin-directory-of-server
+
+- Using mysql, install the plugin:
+
+  MariaDB [(none)]> install plugin disks soname 'libinformation_schema_disks.so';
+
+Usage
+-----
+The plugin appears as the table 'disks' in 'information_schema'.
+
+  MariaDB [(none)]> select * from information_schema.disks;
+  +-----------+-----------------------+-----------+----------+-----------+
+  | Disk      | Path                  | Total     | Used     | Available |
+  +-----------+-----------------------+-----------+----------+-----------+
+  | /dev/sda3 | /                     |  47929956 | 30666308 |  14805860 |
+  | /dev/sda1 | /boot/efi             |    191551 |     3461 |    188090 |
+  | /dev/sda4 | /home                 | 174679768 | 80348148 |  85435364 |
+  | /dev/sdb1 | /mnt/hdd              | 961301832 |    83764 | 912363644 |
+  | /dev/sdb1 | /home/wikman/Music    | 961301832 |    83764 | 912363644 |
+  | /dev/sdb1 | /home/wikman/Videos   | 961301832 |    83764 | 912363644 |
+  ...
+