summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2016-06-30 00:16:10 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commit6c173324ffa0c6d5a6997610ee4e6cc73bd9ae9e (patch)
tree59c88af635603d4369e5938157508b724dd0719c /mysql-test/suite/vcol
parent3aadba15574c2c238671f4ecaa74f330dca4d17d (diff)
downloadmariadb-git-6c173324ffa0c6d5a6997610ee4e6cc73bd9ae9e.tar.gz
Part of MDEV-10134 Add full support for DEFAULT
Print default values for BLOB's. This is a part commit for automatic changes to make the real commit smaller. All changes here are related to that we now print DEFAULT NULL for blob and text fields, like we do for all other fields.
Diffstat (limited to 'mysql-test/suite/vcol')
-rw-r--r--mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result6
-rw-r--r--mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result6
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
index f9a7e2cc65c..772c47aac0d 100644
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
@@ -2184,7 +2184,7 @@ create table t1 (a long, b datetime as (from_days(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` mediumtext,
+ `a` mediumtext DEFAULT NULL,
`b` datetime AS (from_days(a)) VIRTUAL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
insert into t1 values (730669,default);
@@ -2200,7 +2200,7 @@ create table t1 (a long, b datetime as (from_unixtime(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` mediumtext,
+ `a` mediumtext DEFAULT NULL,
`b` datetime AS (from_unixtime(a)) VIRTUAL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
insert into t1 values (1196440219,default);
@@ -2402,7 +2402,7 @@ create table t1 (a long, b time as (sec_to_time(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` mediumtext,
+ `a` mediumtext DEFAULT NULL,
`b` time AS (sec_to_time(a)) VIRTUAL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
insert into t1 values (2378,default);
diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
index 184b4a441b2..1c6af88f9d7 100644
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
@@ -2184,7 +2184,7 @@ create table t1 (a long, b datetime as (from_days(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` mediumtext,
+ `a` mediumtext DEFAULT NULL,
`b` datetime AS (from_days(a)) VIRTUAL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values (730669,default);
@@ -2200,7 +2200,7 @@ create table t1 (a long, b datetime as (from_unixtime(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` mediumtext,
+ `a` mediumtext DEFAULT NULL,
`b` datetime AS (from_unixtime(a)) VIRTUAL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values (1196440219,default);
@@ -2402,7 +2402,7 @@ create table t1 (a long, b time as (sec_to_time(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` mediumtext,
+ `a` mediumtext DEFAULT NULL,
`b` time AS (sec_to_time(a)) VIRTUAL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values (2378,default);