Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4

Author: abarkov

mysql-test/README

@@ -51,7 +51,7 @@ options with which the server is started, restart the server during
 execution, etc.)
 
 You can create your own test cases. To create a test case, create a new
-file in the t subdirectory using a text editor. The file should have a .test
+file in the main subdirectory using a text editor. The file should have a .test
 extension. For example:
 
   # xemacs t/test_case_name.test
@@ -60,7 +60,7 @@ In the file, put a set of SQL statements that create some tables,
 load test data, and run some queries to manipulate it.
 
 Your test should begin by dropping the tables you are going to create and
-end by dropping them again.  This ensures that you can run the test over
+end by dropping them again. This ensures that you can run the test over
 and over again.
 
 If you are using mysqltest commands in your test case, you should create
@@ -81,7 +81,7 @@ comments, you can create the result file in one of the following ways:
 
   # mysqltest --record --database test --result-file=r/test_case_name.result < t/test_case_name.test
 
-When this is done, take a look at r/test_case_name.result .
+When this is done, take a look at r/test_case_name.result.
 If the result is incorrect, you have found a bug. In this case, you should
 edit the test result to the correct results so that we can verify that
 the bug is corrected in future releases.

mysql-test/include/switch_to_mysql_user.inc

@@ -48,7 +48,7 @@ CREATE TABLE mysql.user (
   is_role enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   default_role char(80) binary DEFAULT '' NOT NULL,
   max_statement_time decimal(12,6) DEFAULT 0 NOT NULL,
-  PRIMARY KEY Host (Host,User)
+  PRIMARY KEY (Host,User)
 ) engine=Aria transactional=1 CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
 insert mysql.user select * from mysql.user_bak;
 rename table mysql.global_priv to mysql.global_priv_bak;

mysql-test/main/create.result

@@ -2008,3 +2008,7 @@ create table t1 (i int, j int, key(i), key(i)) as select 1 as i, 2 as j;
 Warnings:
 Note	1831	Duplicate index `i_2`. This is deprecated and will be disallowed in a future release
 drop table t1;
+CREATE TABLE t1 ( id1 INT, id2 INT, CONSTRAINT `foo` PRIMARY KEY (id1), CONSTRAINT `bar` UNIQUE KEY(id2));
+Warnings:
+Warning	1280	Name 'foo' ignored for PRIMARY key.
+DROP TABLE t1;

mysql-test/main/create.test

@@ -1864,3 +1864,10 @@ create table t1;
 #
 create table t1 (i int, j int, key(i), key(i)) as select 1 as i, 2 as j;
 drop table t1;
+
+#
+# MDEV-17544 No warning when trying to name a primary key constraint.
+#
+CREATE TABLE t1 ( id1 INT, id2 INT, CONSTRAINT `foo` PRIMARY KEY (id1), CONSTRAINT `bar` UNIQUE KEY(id2));
+DROP TABLE t1;
+

mysql-test/main/ctype_collate.result

@@ -732,6 +732,8 @@ CREATE TABLE t1 (
 b LONGTEXT CHARACTER SET "latin1" COLLATE "latin1_bin",
 PRIMARY KEY b (b(32))
 );
+Warnings:
+Warning	1280	Name 'b' ignored for PRIMARY key.
 INSERT INTO t1 (b) VALUES ('a'), (_binary 0x1), (_binary 0x0), ('');
 explain 
 select hex(b) from t1 force index (PRIMARY) where b<'zzz';

mysql-test/main/ctype_latin2_ch.result

@@ -10,6 +10,8 @@ tt  char(255) not null
 insert into t1 values (1,'Aa');
 insert into t1 values (2,'Aas');
 alter table t1 add primary key aaa(tt);
+Warnings:
+Warning	1280	Name 'aaa' ignored for PRIMARY key.
 select * from t1 where tt like 'Aa%';
 id	tt
 1	Aa

mysql-test/main/func_hybrid_type.result

@@ -3915,6 +3915,21 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 #
+# MDEV-18456 Assertion `item->maybe_null' failed in Type_handler_temporal_result::make_sort_key
+#
+CREATE TABLE t1 (t TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:20:11'),('14:52:05');
+SELECT GREATEST('9999', t) FROM t1 ORDER BY 1;
+GREATEST('9999', t)
+NULL
+NULL
+Warnings:
+Warning	1292	Incorrect time value: '9999'
+Warning	1292	Incorrect time value: '9999'
+Warning	1292	Incorrect time value: '9999'
+Warning	1292	Incorrect time value: '9999'
+DROP TABLE t1;
+#
 # End of 10.3 tests
 #
 #

mysql-test/main/func_hybrid_type.test

@@ -710,6 +710,16 @@ SHOW CREATE TABLE t1;
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 
+--echo #
+--echo # MDEV-18456 Assertion `item->maybe_null' failed in Type_handler_temporal_result::make_sort_key
+--echo #
+
+CREATE TABLE t1 (t TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:20:11'),('14:52:05');
+SELECT GREATEST('9999', t) FROM t1 ORDER BY 1;
+DROP TABLE t1;
+
+
 --echo #
 --echo # End of 10.3 tests
 --echo #

mysql-test/main/func_str.result

@@ -5068,6 +5068,90 @@ NULL
 
 DROP TABLE t1;
 #
+# MDEV-20292 REPEAT(x,-1) returns a wrong data type
+#
+CREATE OR REPLACE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE OR REPLACE TABLE t2 AS SELECT
+REPEAT(i,NULL) AS cn,
+REPEAT(i,0) AS c0,
+REPEAT(i,-1) AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1, t2;
+#
+# MDEV-20303 SPACE(-1) returns a wrong data type
+#
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+SPACE(NULL) AS cn,
+SPACE(0) AS c0,
+SPACE(-1) AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1, t2;
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+LPAD(i,NULL,'a') AS cn,
+LPAD(i,0,'a') AS c0,
+LPAD(i,-1,'a') AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1, t2;
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+RPAD(i,NULL,'a') AS cn,
+RPAD(i,0,'a') AS c0,
+RPAD(i,-1,'a') AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1, t2;
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+LEFT(i,NULL) AS cn,
+LEFT(i,0) AS c0,
+LEFT(i,18446744073709551615) AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SELECT c1 FROM t2;
+c1
+42
+DROP TABLE t1, t2;
+#
 # End of 10.3 tests
 #
 #

mysql-test/main/func_str.test

@@ -2028,6 +2028,66 @@ SELECT LPAD( c, 0, '?' ) FROM t1;
 SELECT RPAD( c, 0, '?' ) FROM t1;
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-20292 REPEAT(x,-1) returns a wrong data type
+--echo #
+
+CREATE OR REPLACE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE OR REPLACE TABLE t2 AS SELECT
+  REPEAT(i,NULL) AS cn,
+  REPEAT(i,0) AS c0,
+  REPEAT(i,-1) AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+DROP TABLE t1, t2;
+
+
+--echo #
+--echo # MDEV-20303 SPACE(-1) returns a wrong data type
+--echo #
+
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+  SPACE(NULL) AS cn,
+  SPACE(0) AS c0,
+  SPACE(-1) AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+  LPAD(i,NULL,'a') AS cn,
+  LPAD(i,0,'a') AS c0,
+  LPAD(i,-1,'a') AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+  RPAD(i,NULL,'a') AS cn,
+  RPAD(i,0,'a') AS c0,
+  RPAD(i,-1,'a') AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (i BIGINT);
+INSERT INTO t1 VALUES (42);
+CREATE TABLE t2 AS SELECT
+  LEFT(i,NULL) AS cn,
+  LEFT(i,0) AS c0,
+  LEFT(i,18446744073709551615) AS c1
+FROM t1;
+SHOW CREATE TABLE t2;
+SELECT c1 FROM t2;
+DROP TABLE t1, t2;
+
 
 --echo #
 --echo # End of 10.3 tests