summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-25 11:02:03 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-25 11:03:19 +0200
commitc3a6c683e2bba4111a69a34303af13ff9a45b46a (patch)
treed769537a9ef4b6602ce548bf4ccf037e1a78519f /mysql-test/suite/vcol
parentf03f4da66373161d604b8ecf3c23ae18d08c0461 (diff)
parent72b934e3f7d5f0c717cb98b718c9529c74741b4a (diff)
downloadmariadb-git-c3a6c683e2bba4111a69a34303af13ff9a45b46a.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/vcol')
-rw-r--r--mysql-test/suite/vcol/r/vcol_misc.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result
index f3edfa9c026..958ccd7ad33 100644
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
@@ -316,7 +316,7 @@ drop table t1;
# MDEV-5611: self-referencing virtual column
#
create table t1 (a int, b int as (b is null) virtual);
-ERROR 01000: Expression for field `b` is refering to uninitialized field `b`
+ERROR 01000: Expression for field `b` is referring to uninitialized field `b`
create table t1 (a int as (1+1), b int as (a is null) virtual);
drop table t1;
# end of 5.3 tests