diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
| commit | 45531949ae115f2ba7b9450cc2386653483211ba (patch) | |
| tree | 22809f3919c711d5030d2d0e55be969a7bc67e84 /mysql-test/main/alter_table.result | |
| parent | 36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff) | |
| parent | ed13a0d221256028299df4167280e97860ba2edc (diff) | |
| download | mariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/alter_table.result')
| -rw-r--r-- | mysql-test/main/alter_table.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 8e54e882979..a896d24d510 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -751,12 +751,12 @@ create table t1(f1 int); alter table t1 add column f2 datetime not null, add column f21 date not null; insert into t1 values(1,'2000-01-01','2000-01-01'); alter table t1 add column f3 datetime not null; -ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'f3' at row 1 +ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`f3` at row 1 alter table t1 add column f3 date not null; -ERROR 22007: Incorrect date value: '0000-00-00' for column 'f3' at row 1 +ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f3` at row 1 alter table t1 add column f4 datetime not null default '2002-02-02', add column f41 date not null; -ERROR 22007: Incorrect date value: '0000-00-00' for column 'f41' at row 1 +ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f41` at row 1 alter table t1 add column f4 datetime not null default '2002-02-02', add column f41 date not null default '2002-02-02'; select * from t1; |