diff options
| author | unknown <petr/cps@owlet.local> | 2006-09-28 04:44:55 +0400 |
|---|---|---|
| committer | unknown <petr/cps@owlet.local> | 2006-09-28 04:44:55 +0400 |
| commit | 2d48a1f2a3c3539a977839b94a9d3fe703666753 (patch) | |
| tree | 74cc2cd6212441cc4db3e8cec9413899670cca51 /sql/sql_acl.cc | |
| parent | 5529b7fb959e1d01b3699f0c347bb5e97becdc65 (diff) | |
| parent | ac4b66236342910ebfb8aed19ae46113df3465c6 (diff) | |
| download | mariadb-git-2d48a1f2a3c3539a977839b94a9d3fe703666753.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/sp.result:
manual merge
mysql-test/t/sp.test:
manual merge
storage/csv/ha_tina.cc:
manual merge
storage/myisam/ha_myisam.cc:
manual merge
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 318f0798c5d..5badccef544 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -317,7 +317,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 |