Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/union.result:
  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

@@ -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

mysql-test/r/udf_skip_grants.result

+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

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 #

mysql-test/t/udf_skip_grants-master.opt

+--skip-grant-tables

mysql-test/t/udf_skip_grants.test

+####################### 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