database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.2' into bb-10.2-jan

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-19 09:47:08 +02:00
parent f7be8cf285 f566a4f83c
commit f9bdc7c01a
919 changed files with 70106 additions and 18957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result
View File

@@ -61,7 +61,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`id` int(11) NOT NULL,
`a` varchar(255) DEFAULT NULL,
`b` int(11) DEFAULT '2',
`b` int(11) DEFAULT 2,
PRIMARY KEY (`id`),
KEY `a` (`a`),
KEY `b` (`b`)
@@ -71,7 +71,7 @@ Table Create Table
t2 CREATE TABLE `t2` (
`id` int(11) NOT NULL,
`a` varchar(255) DEFAULT NULL,
`b` int(11) DEFAULT '2',
`b` int(11) DEFAULT 2,
PRIMARY KEY (`id`),
KEY `a` (`a`),
KEY `b` (`b`)
@@ -81,7 +81,7 @@ Table Create Table
t3 CREATE TABLE `t3` (
`id` int(11) DEFAULT NULL,
`a` varchar(255) DEFAULT NULL,
`c` int(11) DEFAULT '5',
`c` int(11) DEFAULT 5,
KEY `a` (`a`),
KEY `c` (`c`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
@@ -90,7 +90,7 @@ Table Create Table
t4 CREATE TABLE `t4` (
`id` int(11) DEFAULT NULL,
`a` varchar(255) DEFAULT NULL,
`c` int(11) DEFAULT '5',
`c` int(11) DEFAULT 5,
KEY `a` (`a`),
KEY `c` (`c`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -118,7 +118,7 @@ Table Create Table
t7 CREATE TABLE `t7` (
`id` int(11) NOT NULL,
`a` varchar(255) DEFAULT NULL,
`b` int(11) DEFAULT '2',
`b` int(11) DEFAULT 2,
PRIMARY KEY (`id`),
KEY `a` (`a`),
KEY `b` (`b`)