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 branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-20 08:16:24 +02:00
parent 0f6f1114d4 a938503cfb
commit 0fe39d368a
362 changed files with 7658 additions and 3804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/versioning/r/partition.result
View File

@@ -2274,7 +2274,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_general_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2299,7 +2299,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_general_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2916,7 +2916,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_general_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2953,7 +2953,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_general_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',
@@ -2988,7 +2988,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_general_ci NOT NULL,
`u` int(11) DEFAULT NULL,
`m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute',