Merge 10.3 into 10.4mariadb-10.4.0

9 files changed, 224 insertions, 154 deletions

diff --git a/mysql-test/suite/innodb/r/alter_algorithm,INPLACE.rdiff b/mysql-test/suite/innodb/r/alter_algorithm,INPLACE.rdiff
index 8178e9ea58e..a1fa20c2ba1 100644
--- a/mysql-test/suite/innodb/r/alter_algorithm,INPLACE.rdiff
+++ b/mysql-test/suite/innodb/r/alter_algorithm,INPLACE.rdiff
@@ -64,12 +64,9 @@
  DROP TABLE t1;
  affected rows: 0
  CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
-@@ -58,23 +58,23 @@
+@@ -57,22 +57,22 @@
+ FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
  INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
- SELECT @@alter_algorithm;
- @@alter_algorithm
--COPY
-+INPLACE
  ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
 -affected rows: 1
 -info: Records: 1  Duplicates: 0  Warnings: 0
@@ -99,3 +96,59 @@
 +info: Records: 0  Duplicates: 0  Warnings: 0
  DROP TABLE t2, t1;
  affected rows: 0
+ CREATE TABLE t1(f1 INT NOT NULL,
+@@ -85,27 +85,27 @@
+ INSERT INTO t1(f1, f2) VALUES(1, 1);
+ # Add column at the end of the table
+ ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Change virtual column expression
+ ALTER TABLE t1 CHANGE f3 f3 INT AS (f2 * f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Add virtual column
+ ALTER TABLE t1 ADD COLUMN f5 INT AS (f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Rename Column
+ ALTER TABLE t1 CHANGE f3 vcol INT AS (f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Rename table
+ ALTER TABLE t1 RENAME t3;
+ affected rows: 0
+ # Drop Virtual Column
+ ALTER TABLE t3 DROP COLUMN vcol;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Column length varies
+ ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
+ affected rows: 0
+@@ -113,12 +113,12 @@
+ SET foreign_key_checks = 0;
+ affected rows: 0
+ ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ SET foreign_key_checks = 1;
+ affected rows: 0
+ ALTER TABLE t3 DROP FOREIGN KEY fidx;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ DROP TABLE t3, t2;
+ affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_algorithm,INSTANT.rdiff b/mysql-test/suite/innodb/r/alter_algorithm,INSTANT.rdiff
index ce2e240bb35..879bba43932 100644
--- a/mysql-test/suite/innodb/r/alter_algorithm,INSTANT.rdiff
+++ b/mysql-test/suite/innodb/r/alter_algorithm,INSTANT.rdiff
@@ -55,12 +55,9 @@
  DROP TABLE t1;
  affected rows: 0
  CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
-@@ -58,23 +49,18 @@
+@@ -57,22 +48,17 @@
+ FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
  INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
- SELECT @@alter_algorithm;
- @@alter_algorithm
--COPY
-+INSTANT
  ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
 -affected rows: 1
 -info: Records: 1  Duplicates: 0  Warnings: 0
@@ -85,3 +82,59 @@
 +ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: ADD INDEX. Try ALGORITHM=NOCOPY
  DROP TABLE t2, t1;
  affected rows: 0
+ CREATE TABLE t1(f1 INT NOT NULL,
+@@ -85,27 +71,27 @@
+ INSERT INTO t1(f1, f2) VALUES(1, 1);
+ # Add column at the end of the table
+ ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Change virtual column expression
+ ALTER TABLE t1 CHANGE f3 f3 INT AS (f2 * f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Add virtual column
+ ALTER TABLE t1 ADD COLUMN f5 INT AS (f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Rename Column
+ ALTER TABLE t1 CHANGE f3 vcol INT AS (f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Rename table
+ ALTER TABLE t1 RENAME t3;
+ affected rows: 0
+ # Drop Virtual Column
+ ALTER TABLE t3 DROP COLUMN vcol;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Column length varies
+ ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
+ affected rows: 0
+@@ -113,12 +99,12 @@
+ SET foreign_key_checks = 0;
+ affected rows: 0
+ ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ SET foreign_key_checks = 1;
+ affected rows: 0
+ ALTER TABLE t3 DROP FOREIGN KEY fidx;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ DROP TABLE t3, t2;
+ affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_algorithm,NOCOPY.rdiff b/mysql-test/suite/innodb/r/alter_algorithm,NOCOPY.rdiff
index 5d462e0012d..6db0f2af347 100644
--- a/mysql-test/suite/innodb/r/alter_algorithm,NOCOPY.rdiff
+++ b/mysql-test/suite/innodb/r/alter_algorithm,NOCOPY.rdiff
@@ -55,12 +55,9 @@
  DROP TABLE t1;
  affected rows: 0
  CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
-@@ -58,23 +49,23 @@
+@@ -57,22 +48,22 @@
+ FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
  INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
- SELECT @@alter_algorithm;
- @@alter_algorithm
--COPY
-+NOCOPY
  ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
 -affected rows: 1
 -info: Records: 1  Duplicates: 0  Warnings: 0
@@ -90,3 +87,59 @@
 +info: Records: 0  Duplicates: 0  Warnings: 0
  DROP TABLE t2, t1;
  affected rows: 0
+ CREATE TABLE t1(f1 INT NOT NULL,
+@@ -85,27 +76,27 @@
+ INSERT INTO t1(f1, f2) VALUES(1, 1);
+ # Add column at the end of the table
+ ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Change virtual column expression
+ ALTER TABLE t1 CHANGE f3 f3 INT AS (f2 * f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Add virtual column
+ ALTER TABLE t1 ADD COLUMN f5 INT AS (f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Rename Column
+ ALTER TABLE t1 CHANGE f3 vcol INT AS (f2) VIRTUAL;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Rename table
+ ALTER TABLE t1 RENAME t3;
+ affected rows: 0
+ # Drop Virtual Column
+ ALTER TABLE t3 DROP COLUMN vcol;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ # Column length varies
+ ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
+ affected rows: 0
+@@ -113,12 +104,12 @@
+ SET foreign_key_checks = 0;
+ affected rows: 0
+ ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ SET foreign_key_checks = 1;
+ affected rows: 0
+ ALTER TABLE t3 DROP FOREIGN KEY fidx;
+-affected rows: 1
+-info: Records: 1  Duplicates: 0  Warnings: 0
++affected rows: 0
++info: Records: 0  Duplicates: 0  Warnings: 0
+ DROP TABLE t3, t2;
+ affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_algorithm.result b/mysql-test/suite/innodb/r/alter_algorithm.result
index cbefcad5986..3d3a7e85444 100644
--- a/mysql-test/suite/innodb/r/alter_algorithm.result
+++ b/mysql-test/suite/innodb/r/alter_algorithm.result
@@ -51,14 +51,11 @@ CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
 f3 INT AS (f2 * f2) VIRTUAL,
 f4 INT NOT NULL UNIQUE,
 f5 INT NOT NULL,
-INDEX`idx`(f2))ENGINE=INNODB;
+INDEX idx(f2))ENGINE=INNODB;
 CREATE TABLE t2(f1 INT NOT NULL, f2 INT NOT NULL,
 INDEX(f1),
-FOREIGN KEY `fidx` (f1) REFERENCES t1(f1))ENGINE=INNODB;
+FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
 INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
-SELECT @@alter_algorithm;
-@@alter_algorithm
-COPY
 ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
 affected rows: 1
 info: Records: 1  Duplicates: 0  Warnings: 0
@@ -78,3 +75,50 @@ affected rows: 1
 info: Records: 1  Duplicates: 0  Warnings: 0
 DROP TABLE t2, t1;
 affected rows: 0
+CREATE TABLE t1(f1 INT NOT NULL,
+f2 INT NOT NULL,
+f3 INT AS (f2 * f2) VIRTUAL,
+INDEX idx (f2))engine=innodb;
+CREATE TABLE t2(f1 INT NOT NULL, f2 INT NOT NULL,
+f3 VARCHAR(10),
+INDEX(f1))ENGINE=INNODB;
+INSERT INTO t1(f1, f2) VALUES(1, 1);
+# Add column at the end of the table
+ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+# Change virtual column expression
+ALTER TABLE t1 CHANGE f3 f3 INT AS (f2 * f2) VIRTUAL;
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+# Add virtual column
+ALTER TABLE t1 ADD COLUMN f5 INT AS (f2) VIRTUAL;
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+# Rename Column
+ALTER TABLE t1 CHANGE f3 vcol INT AS (f2) VIRTUAL;
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+# Rename table
+ALTER TABLE t1 RENAME t3;
+affected rows: 0
+# Drop Virtual Column
+ALTER TABLE t3 DROP COLUMN vcol;
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+# Column length varies
+ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
+affected rows: 0
+info: Records: 0  Duplicates: 0  Warnings: 0
+SET foreign_key_checks = 0;
+affected rows: 0
+ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+SET foreign_key_checks = 1;
+affected rows: 0
+ALTER TABLE t3 DROP FOREIGN KEY fidx;
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+DROP TABLE t3, t2;
+affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_instant,COPY.rdiff b/mysql-test/suite/innodb/r/alter_instant,COPY.rdiff
deleted file mode 100644
index cb4a72614b9..00000000000
--- a/mysql-test/suite/innodb/r/alter_instant,COPY.rdiff
+++ /dev/null
@@ -1,61 +0,0 @@
---- alter_instant.result	2018-04-10 11:19:46.299868465 +0530
-+++ alter_instant.reject	2018-04-10 11:21:19.648918489 +0530
-@@ -8,30 +8,30 @@
- INSERT INTO t1(f1, f2) VALUES(1, 1);
- select @@alter_algorithm;
- @@alter_algorithm
--NOCOPY
-+COPY
- # Add column at the end of the table
- ALTER TABLE t1 ADD COLUMN f4 char(100) default "BIG WALL";
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- # Change virtual column expression
- ALTER TABLE t1 CHANGE f3 f3 INT AS (f2 * f2) VIRTUAL;
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- # Add virtual column
- ALTER TABLE t1 ADD COLUMN f5 INT AS (f2) VIRTUAL;
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- # Rename Column
- ALTER TABLE t1 CHANGE f3 vcol INT AS (f2) VIRTUAL;
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- # Rename table
- ALTER TABLE t1 RENAME t3;
- affected rows: 0
- # Drop Virtual Column
- ALTER TABLE t3 DROP COLUMN vcol;
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- # Column length varies
- ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
- affected rows: 0
-@@ -39,12 +39,12 @@
- SET foreign_key_checks = 0;
- affected rows: 0
- ALTER TABLE t3 ADD FOREIGN KEY `fidx`(f2) REFERENCES t2(f1);
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- SET foreign_key_checks = 1;
- affected rows: 0
- ALTER TABLE t3 DROP FOREIGN KEY `fidx`;
--affected rows: 0
--info: Records: 0  Duplicates: 0  Warnings: 0
-+affected rows: 1
-+info: Records: 1  Duplicates: 0  Warnings: 0
- DROP TABLE t3, t2;
- affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_instant,INPLACE.rdiff b/mysql-test/suite/innodb/r/alter_instant,INPLACE.rdiff
deleted file mode 100644
index ec80e1d8ef0..00000000000
--- a/mysql-test/suite/innodb/r/alter_instant,INPLACE.rdiff
+++ /dev/null
@@ -1,11 +0,0 @@
---- alter_instant.result	2018-04-10 11:19:46.299868465 +0530
-+++ alter_instant.reject	2018-04-10 11:22:19.433617807 +0530
-@@ -8,7 +8,7 @@
- INSERT INTO t1(f1, f2) VALUES(1, 1);
- select @@alter_algorithm;
- @@alter_algorithm
--NOCOPY
-+INPLACE
- # Add column at the end of the table
- ALTER TABLE t1 ADD COLUMN f4 char(100) default "BIG WALL";
- affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_instant,INSTANT.rdiff b/mysql-test/suite/innodb/r/alter_instant,INSTANT.rdiff
deleted file mode 100644
index cf2f8a2d719..00000000000
--- a/mysql-test/suite/innodb/r/alter_instant,INSTANT.rdiff
+++ /dev/null
@@ -1,11 +0,0 @@
---- alter_instant.result	2018-04-10 11:19:46.299868465 +0530
-+++ alter_instant.reject	2018-04-10 11:22:47.281949905 +0530
-@@ -8,7 +8,7 @@
- INSERT INTO t1(f1, f2) VALUES(1, 1);
- select @@alter_algorithm;
- @@alter_algorithm
--NOCOPY
-+INSTANT
- # Add column at the end of the table
- ALTER TABLE t1 ADD COLUMN f4 char(100) default "BIG WALL";
- affected rows: 0
diff --git a/mysql-test/suite/innodb/r/alter_instant.result b/mysql-test/suite/innodb/r/alter_instant.result
deleted file mode 100644
index ec64e41cd01..00000000000
--- a/mysql-test/suite/innodb/r/alter_instant.result
+++ /dev/null
@@ -1,50 +0,0 @@
-CREATE TABLE t1(f1 INT NOT NULL,
-f2 INT NOT NULL,
-f3 INT AS (f2 * f2) VIRTUAL,
-INDEX idx (f2))engine=innodb;
-CREATE TABLE t2(f1 INT NOT NULL, f2 INT NOT NULL,
-f3 VARCHAR(10),
-INDEX(f1))ENGINE=INNODB;
-INSERT INTO t1(f1, f2) VALUES(1, 1);
-select @@alter_algorithm;
-@@alter_algorithm
-NOCOPY
-# Add column at the end of the table
-ALTER TABLE t1 ADD COLUMN f4 char(100) default "BIG WALL";
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-# Change virtual column expression
-ALTER TABLE t1 CHANGE f3 f3 INT AS (f2 * f2) VIRTUAL;
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-# Add virtual column
-ALTER TABLE t1 ADD COLUMN f5 INT AS (f2) VIRTUAL;
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-# Rename Column
-ALTER TABLE t1 CHANGE f3 vcol INT AS (f2) VIRTUAL;
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-# Rename table
-ALTER TABLE t1 RENAME t3;
-affected rows: 0
-# Drop Virtual Column
-ALTER TABLE t3 DROP COLUMN vcol;
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-# Column length varies
-ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-SET foreign_key_checks = 0;
-affected rows: 0
-ALTER TABLE t3 ADD FOREIGN KEY `fidx`(f2) REFERENCES t2(f1);
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-SET foreign_key_checks = 1;
-affected rows: 0
-ALTER TABLE t3 DROP FOREIGN KEY `fidx`;
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
-DROP TABLE t3, t2;
-affected rows: 0
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index 3663c18ea44..b4e0f090e5d 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -3126,7 +3126,7 @@ INSERT INTO t1 VALUES (0);
 SET SQL_MODE='STRICT_ALL_TABLES';
 CREATE TABLE t2 
 SELECT LEAST((SELECT '' FROM t1),NOW()) FROM `t1`;
-ERROR 22007: Incorrect datetime value: ''
+ERROR 22007: Truncated incorrect datetime value: ''
 DROP TABLE t1;
 SET SQL_MODE=DEFAULT;
 #