diff options
author | Jacob Mathew <jacob.mathew@mariadb.com> | 2017-04-18 17:36:05 -0700 |
---|---|---|
committer | Jacob Mathew <jacob.mathew@mariadb.com> | 2017-04-18 17:36:05 -0700 |
commit | 0b52b28b91eac1018d865f2f918b83c416565f2f (patch) | |
tree | 1c6be57c366715e0aa134e225e60c1604029eecc /mysql-test/r/explain_json.result | |
parent | 38af34bb2143f2a7ce82d2e241d8995f419a7f29 (diff) | |
download | mariadb-git-0b52b28b91eac1018d865f2f918b83c416565f2f.tar.gz |
MDEV-10355 Weird error message upon CREATE TABLE with DEFAULTbb-10.2-MDEV-10355
Fixed handling of default values with cached temporal functions so that the
CREATE TABLE statement now succeeds.
Fixed virtual column session cleanup.
Fixed the error message.
Added quoting of date/time values in cases when this was omitted.
Added a test case in default.test.
Updated test result files.
Diffstat (limited to 'mysql-test/r/explain_json.result')
-rw-r--r-- | mysql-test/r/explain_json.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result index 1af67cf6a4e..f416e5c2554 100644 --- a/mysql-test/r/explain_json.result +++ b/mysql-test/r/explain_json.result @@ -811,7 +811,7 @@ EXPLAIN "ref": ["func"], "rows": 2, "filtered": 100, - "attached_condition": "trigcond(<cache>(outer_t1.a) = t1.a or t1.a is null)", + "attached_condition": "trigcond(outer_t1.a = t1.a or t1.a is null)", "using_index": true } }, @@ -825,7 +825,7 @@ EXPLAIN "buffer_type": "flat", "buffer_size": "256Kb", "join_type": "BNL", - "attached_condition": "t2.b <> outer_t1.a and trigcond(<cache>(outer_t1.a) = t1.a or t1.a is null)" + "attached_condition": "t2.b <> outer_t1.a and trigcond(outer_t1.a = t1.a or t1.a is null)" } } } @@ -1106,7 +1106,7 @@ EXPLAIN "access_type": "ALL", "rows": 2, "filtered": 100, - "attached_condition": "(case when convert(t1.a using utf8) = <cache>(_utf8'a' collate utf8_bin) then NULL else t1.a end)" + "attached_condition": "(case when convert(t1.a using utf8) = _utf8'a' collate utf8_bin then NULL else t1.a end)" } } } |