bk commit into 5.0 tree (bell:1.2043) BUG#13504

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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
  1.2043 05/10/18 21:42:26 bell@stripped +3 -0
  check of ACL initialization in is_acl_user() (BUG#13504)

  sql/sql_acl.cc
    1.175 05/10/18 21:42:20 bell@stripped +5 -0
    check of ACL initialization in is_acl_user()

  mysql-test/t/skip_grants.test
    1.5 05/10/18 21:42:20 bell@stripped +8 -0
    creation view with DEFINER clause if --skip-grant-tables

  mysql-test/r/skip_grants.result
    1.5 05/10/18 21:42:20 bell@stripped +4 -0
    creation view with DEFINER clause if --skip-grant-tables

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug4-5.0

--- 1.174/sql/sql_acl.cc	2005-09-28 17:43:40 +03:00
+++ 1.175/sql/sql_acl.cc	2005-10-18 21:42:20 +03:00
@@ -1487,6 +1487,11 @@
 bool is_acl_user(const char *host, const char *user)
 {
   bool res;
+
+  /* --skip-grants */
+  if (!initialized)
+    return TRUE;
+
   VOID(pthread_mutex_lock(&acl_cache->lock));
   res= find_acl_user(host, user, TRUE) != NULL;
   VOID(pthread_mutex_unlock(&acl_cache->lock));

--- 1.4/mysql-test/r/skip_grants.result	2005-09-14 10:53:02 +03:00
+++ 1.5/mysql-test/r/skip_grants.result	2005-10-18 21:42:20 +03:00
@@ -8,3 +8,7 @@
 drop table t1;
 create procedure f1() select 1;
 drop procedure f1;
+create table t1 (a int);
+create definer='user'@'host' sql security definer view v1 as select * from t1;
+drop view v1;
+drop table t1;

--- 1.4/mysql-test/t/skip_grants.test	2005-09-14 10:53:02 +03:00
+++ 1.5/mysql-test/t/skip_grants.test	2005-10-18 21:42:20 +03:00
@@ -19,3 +19,11 @@
 #
 create procedure f1() select 1;
 drop procedure f1;
+
+#
+# BUG#13504: creation view with DEFINER clause if --skip-grant-tables
+#
+create table t1 (a int);
+create definer='user'@'host' sql security definer view v1 as select * from t1;
+drop view v1;
+drop table t1;