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

Merge branch '11.4' into 11.7

* 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
470 changed files with 12036 additions and 6930 deletions

View File

@@ -1,6 +1,6 @@
/*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 `sv_basic` (
`a` int(11) NOT NULL,
PRIMARY KEY (`a`)
@@ -12,7 +12,7 @@ INSERT INTO `sv_basic` (`a`, row_start, row_end) VALUES (1,'2023-12-19 14:23:22.
(3,'2023-12-19 14:23:22.304434','2038-01-19 03:14:07.999999');
/*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `sv_explicit` (
`a` int(11) DEFAULT NULL,
`row_foo_start` timestamp(6) GENERATED ALWAYS AS ROW START,
@@ -27,7 +27,7 @@ INSERT INTO `sv_explicit` VALUES
(3,'2023-12-19 14:23:22.358302','2038-01-19 03:14:07.999999');
/*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `sv_partition` (
`a` int(11) NOT NULL,
PRIMARY KEY (`a`)
@@ -43,7 +43,7 @@ INSERT INTO `sv_partition` (`a`, row_start, row_end) VALUES (2,'2023-12-19 14:23
/*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;
/*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 `sv_basic` (
`a` int(11) NOT NULL,
PRIMARY KEY (`a`)
@@ -55,7 +55,7 @@ INSERT INTO `sv_basic` (`a`, row_start, row_end) VALUES (1,'2023-12-19 14:23:22.
(3,'2023-12-19 14:23:22.304434','2106-02-07 06:28:15.999999');
/*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `sv_explicit` (
`a` int(11) DEFAULT NULL,
`row_foo_start` timestamp(6) GENERATED ALWAYS AS ROW START,
@@ -70,7 +70,7 @@ INSERT INTO `sv_explicit` VALUES
(3,'2023-12-19 14:23:22.358302','2106-02-07 06:28:15.999999');
/*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `sv_partition` (
`a` int(11) NOT NULL,
PRIMARY KEY (`a`)