database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '11.4' into 11.7

Browse Source 
* rpl.rpl_system_versioning_partitions updated for MDEV-32188
* innodb.row_size_error_log_warnings_3 changed error for MDEV-33658
  (checks are done in a different order)
This commit is contained in:
Sergei Golubchik
2025-02-06 16:46:02 +01:00
parent 14a80f0929 0771110266
commit ba01c2aaf0
470 changed files with 12036 additions and 6930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/sql_sequence/mysqldump.result
View File

@ -9,7 +9,7 @@ DO SETVAL(`a1`, 1, 0);
CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
DO SETVAL(`x1`, 1, 0);
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
KEY `a` (`a`)
@ -25,7 +25,7 @@ DO SETVAL(`a1`, 1, 0);
CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
DO SETVAL(`x1`, 1, 0);
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
KEY `a` (`a`)
@ -41,7 +41,7 @@ DO SETVAL(`a1`, 1, 0);
CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
DO SETVAL(`x1`, 1, 0);
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
KEY `a` (`a`)
@ -53,7 +53,7 @@ INSERT INTO `t1` VALUES
# dump by tables only tables
/*M!999999\- enable the sandbox mode */
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
KEY `a` (`a`)

15
mysql-test/suite/sql_sequence/temporary.result
View File

@ -41,3 +41,18 @@ select nextval(s1);
nextval(s1)
2
drop temporary sequence s1;
# End of 10.6 test
#
# MDEV-31298 Assertion `!check_foreigns' failed in trx_mod_table_time_t* trx_t::check_bulk_buffer(dict_table_t*), Assertion `table->skip_alter_undo || !check_unique_secondary' failed in trx_t::check_bulk_buffer
#
set foreign_key_checks=0,unique_checks=0;
create table t1 (c1 char,index (c1)) engine=innodb;
xa start 'a';
insert into t1 values();
set foreign_key_checks=1,unique_checks=1;
create temporary sequence f engine=innodb;
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state
xa end 'a';
xa rollback 'a';
drop table t1;
# End of 10.11 test

18
mysql-test/suite/sql_sequence/temporary.test
View File

@ -45,3 +45,21 @@ select nextval(s1);
select nextval(s1);
drop temporary sequence s1;
--enable_ps2_protocol
--echo # End of 10.6 test
--echo #
--echo # MDEV-31298 Assertion `!check_foreigns' failed in trx_mod_table_time_t* trx_t::check_bulk_buffer(dict_table_t*), Assertion `table->skip_alter_undo || !check_unique_secondary' failed in trx_t::check_bulk_buffer
--echo #
set foreign_key_checks=0,unique_checks=0;
create table t1 (c1 char,index (c1)) engine=innodb;
xa start 'a';
insert into t1 values();
set foreign_key_checks=1,unique_checks=1;
--error ER_XAER_RMFAIL
create temporary sequence f engine=innodb;
xa end 'a';
xa rollback 'a';
drop table t1;
--echo # End of 10.11 test