database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 22:59:58 +02:00
parent 77992bc710 1423cf5e3d
commit 7841a7eb09
339 changed files with 7425 additions and 2358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mysql-test/main/union.result
View File

@ -1612,7 +1612,7 @@ NULL binary(0) YES NULL
CREATE TABLE t5 SELECT NULL UNION SELECT NULL;
DESC t5;
Field Type Null Key Default Extra
NULL null YES NULL
NULL binary(0) YES NULL
CREATE TABLE t6
SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1;
DESC t6;
@ -2650,5 +2650,34 @@ CAST(1 AS UNSIGNED)
1
1
#
# MDEV-24511 null field is created with CREATE..SELECT
#
set @save_default_storage_engine=@@default_storage_engine;
SET @@default_storage_engine=MEMORY;
CREATE TABLE t1 SELECT NULL UNION SELECT NULL;
ALTER TABLE t1 ADD INDEX (`PRIMARY`);
ERROR 42000: Key column 'PRIMARY' doesn't exist in table
CREATE TABLE t2 SELECT NULL;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`NULL` binary(0) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
CREATE TABLE t3 SELECT NULL UNION SELECT NULL;
SHOW CREATE TABLE t3;
Table Create Table
t3 CREATE TABLE `t3` (
`NULL` binary(0) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
CREATE OR REPLACE TABLE t4 SELECT NULL UNION SELECT NULL;
SHOW CREATE TABLE t4;
Table Create Table
t4 CREATE TABLE `t4` (
`NULL` binary(0) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
ALTER TABLE t4 ADD INDEX (`NULL`);
DROP TABLE t1, t2, t3, t4;
set @@default_storage_engine=@save_default_storage_engine;
#
# End of 10.3 tests
#