diff options
| author | unknown <kaa@kaamos.(none)> | 2008-01-10 13:37:54 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-01-10 13:37:54 +0300 |
| commit | 10909bf44b8415fccdd6c0e38dea3f3a89a0898f (patch) | |
| tree | a63a339cd1e13f304810012dd801d95aa8c3a654 /mysql-test/r/skip_grants.result | |
| parent | baf5c2c132f498df72c5c8196d591481e03b9fee (diff) | |
| parent | bdad41bacebf141be5dbe64e744eee106a1a80fd (diff) | |
| download | mariadb-git-10909bf44b8415fccdd6c0e38dea3f3a89a0898f.tar.gz | |
Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305
into kaamos.(none):/data/src/opt/bug33305/my51-bug33305
mysql-test/r/cast.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/skip_grants.result:
Manual merge.
Diffstat (limited to 'mysql-test/r/skip_grants.result')
| -rw-r--r-- | mysql-test/r/skip_grants.result | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/skip_grants.result b/mysql-test/r/skip_grants.result index bf0f16a174f..b523f2edc9f 100644 --- a/mysql-test/r/skip_grants.result +++ b/mysql-test/r/skip_grants.result @@ -72,10 +72,6 @@ count(*) select count(*) from information_schema.USER_PRIVILEGES; count(*) 0 -CREATE FUNCTION a RETURNS STRING SONAME ''; -ERROR HY000: Can't initialize function 'a'; UDFs are unavailable with the --skip-grant-tables option -DROP FUNCTION a; -ERROR 42000: FUNCTION test.a does not exist End of 5.0 tests # # Bug#29817 Queries with UDF fail with non-descriptive error |