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.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-09-11 11:29:31 +03:00
parent b08474435f 65c99207e0
commit f8f7d9de2c
83 changed files with 1045 additions and 22797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/t/monitor.test
View File

@@ -433,6 +433,8 @@ SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
SET GLOBAL innodb_monitor_enable='%';
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL innodb_monitor_reset_all= '%', innodb_compression_algorithm= foo;
INSERT INTO t1 VALUES (5), (6), (7), (8); FLUSH TABLES t1 FOR EXPORT;
UNLOCK TABLES;
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

19
mysql-test/suite/innodb/t/strict_mode.test
View File

@@ -1,4 +1,5 @@
--source include/have_innodb.inc
--source include/not_embedded.inc
--echo #
--echo # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
@@ -401,3 +402,21 @@ set innodb_strict_mode = 1;
alter table t1 engine=InnoDB;
drop table t1;
--echo #
--echo # MDEV-32128 wrong table name in innodb's "row too big" errors
--echo #
--error ER_TOO_BIG_ROWSIZE
create temporary table t1 (
c1 char(255), c2 char(255), c3 char(255), c4 char(255),
c5 char(255), c6 char(255), c7 char(255), c8 char(255),
c9 char(255), c10 char(255), c11 char(255), c12 char(255),
c13 char(255), c14 char(255), c15 char(255), c16 char(255),
c17 char(255), c18 char(255), c19 char(255), c20 char(255),
c21 char(255), c22 char(255), c23 char(255), c24 char(255),
c25 char(255), c26 char(255), c27 char(255), c28 char(255),
c29 char(255), c30 char(255), c31 char(255), c32 char(255)
) engine=innodb;
let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err;
let SEARCH_PATTERN=Cannot add field `c32` in table `test`.`t1` because;
source include/search_pattern_in_file.inc;