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.5

This commit is contained in:
Oleksandr Byelkin
2024-08-05 17:50:18 +02:00
508 changed files with 12703 additions and 5123 deletions

View File

@@ -2258,7 +2258,7 @@ Table Create Table
tp1 CREATE TABLE `tp1` (
`x` int(11) NOT NULL AUTO_INCREMENT,
`t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000',
`b` blob /*!100301 COMPRESSED*/ DEFAULT NULL,
`b` blob /*M!100301 COMPRESSED*/ DEFAULT NULL,
`c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2283,7 +2283,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`x` int(11) NOT NULL AUTO_INCREMENT,
`t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000',
`b` blob /*!100301 COMPRESSED*/ DEFAULT NULL,
`b` blob /*M!100301 COMPRESSED*/ DEFAULT NULL,
`c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2900,7 +2900,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`x` int(11) NOT NULL AUTO_INCREMENT,
`t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000',
`b` blob /*!100301 COMPRESSED*/ DEFAULT NULL,
`b` blob /*M!100301 COMPRESSED*/ DEFAULT NULL,
`c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2937,7 +2937,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`x` int(11) NOT NULL AUTO_INCREMENT,
`t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000',
`b` blob /*!100301 COMPRESSED*/ DEFAULT NULL,
`b` blob /*M!100301 COMPRESSED*/ DEFAULT NULL,
`c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2972,7 +2972,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`x` int(11) NOT NULL AUTO_INCREMENT,
`t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000',
`b` blob /*!100301 COMPRESSED*/ DEFAULT NULL,
`b` blob /*M!100301 COMPRESSED*/ DEFAULT NULL,
`c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',