summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-12-02 13:34:30 +0400
committerunknown <ram@gw.mysql.r18.ru>2004-12-02 13:34:30 +0400
commit491a3d90a99c3849c220592b4f8ff29de8484de9 (patch)
treec596bb93ad8484a3ee8304221ae337a4af3061c8 /sql/sql_acl.cc
parent6f20687e202303fe61a4e827fe74a5133e57337a (diff)
downloadmariadb-git-491a3d90a99c3849c220592b4f8ff29de8484de9.tar.gz
Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv
bug #6933: error in the tests/grant.pl test). mysql-test/r/grant.result: A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv). mysql-test/t/grant.test: A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv). sql/sql_acl.cc: A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv). The problem is that we use whole key length (including 'Column_name' keypart) during scanning the 'columns_priv' table in case of revoke_grant. tests/grant.pl: A fix (bug #6933: error in the tests/grant.pl test).
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index d6f52fed1d2..f1698dcc911 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2035,7 +2035,7 @@ static int replace_column_table(GRANT_TABLE *g_t,
{
table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
if (table->file->index_read(table->record[0], (byte*) table->field[0]->ptr,
- table->key_info[0].key_length,
+ key_length,
HA_READ_KEY_EXACT))
goto end;