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/t | |
| 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/t')
| -rw-r--r-- | mysql-test/t/skip_grants.test | 10 | ||||
| -rw-r--r-- | mysql-test/t/udf_skip_grants-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/udf_skip_grants.test | 28 |
3 files changed, 29 insertions, 10 deletions
diff --git a/mysql-test/t/skip_grants.test b/mysql-test/t/skip_grants.test index 72a073ac541..6f4d23e1e14 100644 --- a/mysql-test/t/skip_grants.test +++ b/mysql-test/t/skip_grants.test @@ -122,16 +122,6 @@ select count(*) from information_schema.COLUMN_PRIVILEGES; select count(*) from information_schema.SCHEMA_PRIVILEGES; select count(*) from information_schema.TABLE_PRIVILEGES; select count(*) from information_schema.USER_PRIVILEGES; -# -# Bug #32020: loading udfs while --skip-grant-tables is enabled causes out of -# memory errors -# - ---error ER_CANT_INITIALIZE_UDF -CREATE FUNCTION a RETURNS STRING SONAME ''; ---error ER_SP_DOES_NOT_EXIST -DROP FUNCTION a; - --echo End of 5.0 tests --echo # diff --git a/mysql-test/t/udf_skip_grants-master.opt b/mysql-test/t/udf_skip_grants-master.opt new file mode 100644 index 00000000000..5699a3387b8 --- /dev/null +++ b/mysql-test/t/udf_skip_grants-master.opt @@ -0,0 +1 @@ +--skip-grant-tables diff --git a/mysql-test/t/udf_skip_grants.test b/mysql-test/t/udf_skip_grants.test new file mode 100644 index 00000000000..bd9402e0d8a --- /dev/null +++ b/mysql-test/t/udf_skip_grants.test @@ -0,0 +1,28 @@ +####################### udf_skip_grants.test ########################### +# # +# Test for bug #32020 "loading udfs while --skip-grant-tables is # +# enabled causes out of memory errors" # +# # +# Creation: # +# 2007-12-24 akopytov Moved the test case for bug #32020 from # +# skip_grants.test to a separate test to ensure # +# that it is only run when the server is built # +# with support for dynamically loaded libraries # +# (see bug #33305). # +# # +######################################################################## + +-- source include/not_embedded.inc +-- source include/have_udf.inc + +# +# Bug #32020: loading udfs while --skip-grant-tables is enabled causes out of +# memory errors +# + +--error ER_CANT_INITIALIZE_UDF +CREATE FUNCTION a RETURNS STRING SONAME ''; +--error ER_SP_DOES_NOT_EXIST +DROP FUNCTION a; + +--echo End of 5.0 tests |