1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.2 into 10.3

This commit is contained in:
Marko Mäkelä
2020-07-02 06:17:51 +03:00
210 changed files with 2371 additions and 698 deletions

View File

@ -639,3 +639,22 @@ ALTER TABLE t1 CHANGE no_such_col1 col1 BIGINT NULL;
# was not dropped during the first TRUNCATE due to extra table handles.
TRUNCATE TABLE t1;
DROP TEMPORARY TABLE t1;
--echo #
--echo # MDEV-21695 Server crashes in TABLE::evaluate_update_default_function upon UPDATE on temporary table
--echo #
SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:20:30');
CREATE TEMPORARY TABLE t1 (a DATETIME ON UPDATE CURRENT_TIMESTAMP);
ALTER TABLE t1 ADD b INT;
INSERT INTO t1 (b) VALUES (1),(2);
--error ER_BAD_FIELD_ERROR
ALTER TABLE t1 CHANGE COLUMN x xx INT;
UPDATE t1 SET b = 3;
SELECT * FROM t1;
DROP TEMPORARY TABLE t1;
--echo #
--echo # End of 10.2 tests
--echo #