diff options
| author | jimw@mysql.com <> | 2005-07-06 16:49:04 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-07-06 16:49:04 -0700 |
| commit | f1ac600a7ed15635288bc2d8d55ff3115338e2bb (patch) | |
| tree | a8b80d8787143eca5e117b5eae0731a99f34dea2 /sql/sql_acl.cc | |
| parent | 7d7a59e46f34cac967ee164b559edb19d754912f (diff) | |
| parent | 7e70aee169ea8df771b64a2c0e516704d94b4379 (diff) | |
| download | mariadb-git-f1ac600a7ed15635288bc2d8d55ff3115338e2bb.tar.gz | |
Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index a467478a012..04666469e9c 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2477,7 +2477,6 @@ static int replace_routine_table(THD *thd, GRANT_NAME *grant_name, int old_row_exists= 1; int error=0; ulong store_proc_rights; - byte *key; DBUG_ENTER("replace_routine_table"); if (!initialized) @@ -3217,7 +3216,6 @@ my_bool grant_init(THD *org_thd) do { GRANT_NAME *mem_check; - longlong proc_type; HASH *hash; if (!(mem_check=new GRANT_NAME(p_table))) { |