diff options
| author | unknown <monty@mishka.local> | 2004-05-16 14:49:32 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-05-16 14:49:32 +0300 |
| commit | 8ef62cc1ef3e2b16795fa5fbbc45bcdf422f344c (patch) | |
| tree | 0f57d538c1b4bb04893ef169be6dc7ab73ee1c67 /sql/sql_acl.cc | |
| parent | 36bce251128b8fd300c4a6329d0c2d8f601a14bc (diff) | |
| parent | 70f79563d9fa8ef3cdfef01b8eee95ea6e927147 (diff) | |
| download | mariadb-git-8ef62cc1ef3e2b16795fa5fbbc45bcdf422f344c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 880b6eb74ee..fbd47d4954d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1820,7 +1820,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(col_privs,key,0,key_len)); + !key_cmp_if_same(col_privs,key,0,key_len)); } } @@ -2043,7 +2043,7 @@ static int replace_column_table(GRANT_TABLE *g_t, } } } while (!table->file->index_next(table->record[0]) && - !key_cmp(table,key,0,key_length)); + !key_cmp_if_same(table,key,0,key_length)); } end: |