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

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2022-08-24 09:22:34 +03:00
parent dc11fd07fd 5b4c832c7e
commit bdd80e3fb1
46 changed files with 627 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/innodb/t/change_column_collation.test
View File

@@ -122,4 +122,14 @@ ALTER TABLE t1 MODIFY msg_2 VARCHAR(100) CHARACTER SET utf8
COLLATE utf8_unicode_ci, ALGORITHM=inplace;
DROP TABLE t1;
--echo #
--echo # MDEV-29314 Assertion `n_fields > n_cols' failed
--echo # in dict_index_t::init_change_cols
--echo #
CREATE TABLE t (a VARCHAR(16) COLLATE utf8_bin,
FULLTEXT (a)) ENGINE=InnoDB COLLATE utf8_unicode_520_ci;
ALTER TABLE t MODIFY COLUMN a VARCHAR(512);
SHOW CREATE TABLE t;
DROP TABLE t;
--source include/wait_until_count_sessions.inc

1
mysql-test/suite/innodb/t/temporary_table.test
View File

@@ -5,6 +5,7 @@
#
--source include/have_innodb.inc
--source include/innodb_page_size.inc
# Embedded server does not restart of server
--source include/not_embedded.inc
--source include/no_valgrind_without_big.inc