summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 16:10:02 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 16:10:02 +0200
commitfb0808c450849e00993fa38839f33969a9daf7e8 (patch)
tree55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /mysql-test/suite/vcol
parentfb41117c907a99d051ac09c229762978373d7eb0 (diff)
parent8760f6907c51e0e20242a53188be5b62029d6f1a (diff)
downloadmariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/vcol')
-rw-r--r--mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
index 19e8efb06ad..1cf24194c5b 100644
--- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
+++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
@@ -191,7 +191,7 @@ create or replace table t1 (a int, b int as (stddev_pop(a)));
ERROR HY000: Function or expression 'std()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# STDDEV_SAMP()
create or replace table t1 (a int, b int as (stddev_samp(a)));
-ERROR HY000: Function or expression 'std()' cannot be used in the GENERATED ALWAYS AS clause of `b`
+ERROR HY000: Function or expression 'stddev_samp()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# STDDEV()
create or replace table t1 (a int, b int as (stddev(a)));
ERROR HY000: Function or expression 'std()' cannot be used in the GENERATED ALWAYS AS clause of `b`