diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:25:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:25:38 +0300 |
| commit | 186a998b5b932851d64666c92e3062c9e997e77b (patch) | |
| tree | 606b064a57936b2e6f10e0b396ed6d5165a6d419 /mysql-test/main/type_json.result | |
| parent | c3289d27eef39a47fed2ce1ff239013ed6870f39 (diff) | |
| parent | 400cf017152c732387c89deaa082b43c8fb42d71 (diff) | |
| download | mariadb-git-186a998b5b932851d64666c92e3062c9e997e77b.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/type_json.result')
| -rw-r--r-- | mysql-test/main/type_json.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/type_json.result b/mysql-test/main/type_json.result index 2c1fdbe2b95..0045847097b 100644 --- a/mysql-test/main/type_json.result +++ b/mysql-test/main/type_json.result @@ -20,7 +20,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert t1 values ('[]'); insert t1 values ('a'); -ERROR 23000: CONSTRAINT `a` failed for `test`.`t1` +ERROR 23000: CONSTRAINT `t1.a` failed for `test`.`t1` set timestamp=unix_timestamp('2010:11:12 13:14:15'); create or replace table t1(a json default(json_object('now', now()))); show create table t1; |