diff options
| author | unknown <joreland@mysql.com> | 2004-07-06 17:49:34 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-07-06 17:49:34 +0200 |
| commit | 8ce9725e5396640de11d4a524acd0954c0cc5f8e (patch) | |
| tree | 67a6260365447fe07a1f5c947053a769e261d2ce | |
| parent | 10935692c9a3256b266e9311dcc3723c671db52a (diff) | |
| parent | 6407a9325995588d8c40724d6570e7316ef4716a (diff) | |
| download | mariadb-git-8ce9725e5396640de11d4a524acd0954c0cc5f8e.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 99ee1c5182b..398a9295579 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -11,6 +11,7 @@ administrador@light.hegel.local ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com antony@ltantony.dsl-verizon.net +antony@ltantony.rdg.cyberkinetica.com antony@ltantony.rdg.cyberkinetica.homeunix.net arjen@bitbike.com arjen@co3064164-a.bitbike.com diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index a03e371dd63..fa8065a5fc3 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1790,11 +1790,13 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs) col_privs->field[3]->pack_length()); key_copy(key,col_privs,0,key_len); col_privs->field[4]->store("",0, &my_charset_latin1); - if (col_privs->file->index_read_idx(col_privs->record[0],0, + col_privs->file->ha_index_init(0); + if (col_privs->file->index_read(col_privs->record[0], (byte*) col_privs->field[0]->ptr, key_len, HA_READ_KEY_EXACT)) { cols = 0; /* purecov: deadcode */ + col_privs->file->ha_index_end(); return; } do @@ -1814,6 +1816,7 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs) my_hash_insert(&hash_columns, (byte *) mem_check); } while (!col_privs->file->index_next(col_privs->record[0]) && !key_cmp_if_same(col_privs,key,0,key_len)); + col_privs->file->ha_index_end(); } } |