MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexey Kopytov Date:December 24 2007 2:42pm
Subject:bk commit into 5.0 tree (kaa:1.2594) BUG#33305
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-24 17:42:13+03:00, kaa@polly.(none) +5 -0
  Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading
                      to be compiled in
  
  The problem was that on a statically built server an attempt to create
  a UDF resulted in a different, but reasonable error ("Can't open shared
  library" instead of "UDFs are unavailable with the --skip-grant-tables
  option"), which caused a failure for the test case for bug #32020.
  
  Fixed by moving 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.

  mysql-test/r/skip_grants.result@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -4
    Moved the test case for bug #32020 to a separate test.

  mysql-test/r/udf_skip_grants.result@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +5 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/r/udf_skip_grants.result@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/skip_grants.test@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -10
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants-master.opt@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +1 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants-master.opt@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/udf_skip_grants.test@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +28 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants.test@stripped, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

diff -Nrup a/mysql-test/r/skip_grants.result b/mysql-test/r/skip_grants.result
--- a/mysql-test/r/skip_grants.result	2007-11-09 13:29:36 +03:00
+++ b/mysql-test/r/skip_grants.result	2007-12-24 17:42:07 +03:00
@@ -70,8 +70,4 @@ 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
diff -Nrup a/mysql-test/r/udf_skip_grants.result b/mysql-test/r/udf_skip_grants.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/udf_skip_grants.result	2007-12-24 17:42:07 +03:00
@@ -0,0 +1,5 @@
+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
diff -Nrup a/mysql-test/t/skip_grants.test b/mysql-test/t/skip_grants.test
--- a/mysql-test/t/skip_grants.test	2007-11-09 13:29:36 +03:00
+++ b/mysql-test/t/skip_grants.test	2007-12-24 17:42:07 +03:00
@@ -117,14 +117,4 @@ select count(*) from information_schema.
 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
diff -Nrup a/mysql-test/t/udf_skip_grants-master.opt b/mysql-test/t/udf_skip_grants-master.opt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/udf_skip_grants-master.opt	2007-12-24 17:42:07 +03:00
@@ -0,0 +1 @@
+--skip-grant-tables
diff -Nrup a/mysql-test/t/udf_skip_grants.test b/mysql-test/t/udf_skip_grants.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/udf_skip_grants.test	2007-12-24 17:42:07 +03:00
@@ -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
Thread
bk commit into 5.0 tree (kaa:1.2594) BUG#33305Alexey Kopytov24 Dec