diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 11:46:29 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 11:46:29 +0400 |
| commit | afedaa108977d8de05af6fd5915d4a86bdbe91ff (patch) | |
| tree | e11d30689b96899d873049f1c2705143b35fc810 /sql/sql_acl.cc | |
| parent | bde596273895f1fbc3b880f9b63205151f314a46 (diff) | |
| parent | d4933af87efb8f7b01d48c4ba46ff196f73a193f (diff) | |
| download | mariadb-git-afedaa108977d8de05af6fd5915d4a86bdbe91ff.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21414
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 010a5c33b96..95a0d575251 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -202,7 +202,6 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) DBUG_ENTER("acl_load"); grant_version++; /* Privileges updated */ - mysql_proc_table_exists= 1; // Assume mysql.proc exists acl_cache->clear(1); // Clear locked hostname cache |