diff options
| author | unknown <konstantin@mysql.com> | 2006-02-22 14:04:24 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-22 14:04:24 +0300 |
| commit | ae8ed9fdf1dcfd0dde00e60b973965e3da68d34f (patch) | |
| tree | 4324672b892ff589d9c5aa20cb3a5bc7c2665c63 /mysql-test/r/sp-error.result | |
| parent | 1b6e7fdf55ebac968a2d8ef29a443d759f2765b8 (diff) | |
| parent | 85e54a08c4fc468ab89f8df27bc981027cb22e6c (diff) | |
| download | mariadb-git-ae8ed9fdf1dcfd0dde00e60b973965e3da68d34f.tar.gz | |
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Manual merge
sql/sql_base.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index fc29f915b82..5ab8779782a 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -1163,3 +1163,6 @@ end| call bug15091(); ERROR 42S02: Unknown table 'c' in field list drop procedure bug15091; +drop function if exists bug16896; +create aggregate function bug16896() returns int return 1; +ERROR 42000: AGGREGATE is not supported for stored functions |