diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-12 17:23:23 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-12 17:23:23 +0200 |
| commit | 32208e0255c62579779c3d8df0effa83d0d7b985 (patch) | |
| tree | 7465497eea09d41b58d6a87fde0fdb9a36365729 | |
| parent | f16873ec9aed16919735486f3c3839557df671b4 (diff) | |
| parent | ce194f04c50f4d2b9de3d855ca35f2174b9b7f98 (diff) | |
| download | mariadb-git-32208e0255c62579779c3d8df0effa83d0d7b985.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
| -rw-r--r-- | sql/gen_lex_hash.cc | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index f94d8dddb59..2be57a49a99 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -274,7 +274,7 @@ void print_arrays() function_plus,function_mod); int *prva= (int*) my_alloca(sizeof(int)*function_mod); - for (i=0 ; i <= function_mod; i++) + for (i=0 ; i < function_mod; i++) prva[i]= max_symbol; for (i=0;i<size;i++) diff --git a/sql/sql_base.cc b/sql/sql_base.cc index bab4c151ef3..1ed0673f4cf 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1616,7 +1616,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length, else thd->dupp_field=field; } - if (check_grants && !thd->master_access && check_grant_column(thd,table,name,length)) + if (check_grants && check_grant_column(thd,table,name,length)) return WRONG_GRANT; return field; } @@ -1643,7 +1643,8 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables) { found_table=1; Field *find=find_field_in_table(thd,tables->table,name,length, - grant_option && !thd->master_access,1); + grant_option && + tables->grant.want_privilege ,1); if (find) { if (find == WRONG_GRANT) @@ -1682,7 +1683,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables) for (; tables ; tables=tables->next) { Field *field=find_field_in_table(thd,tables->table,name,length, - grant_option && !thd->master_access, allow_rowid); + grant_option && tables->grant.want_privilege ,allow_rowid); if (field) { if (field == WRONG_GRANT) |