diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-07 20:18:51 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-07 20:18:51 +0300 |
| commit | 6db21de014d603477952c7a16449bcae40a70e5c (patch) | |
| tree | dede3c4032371335b0e52c74cca1beba2483d7c6 /sql/sql_acl.cc | |
| parent | 46f5c97d312a84c0620958f4fcf0df6acd676256 (diff) | |
| parent | fa1613be0a54ba87321501a52d62d4e99d237945 (diff) | |
| download | mariadb-git-6db21de014d603477952c7a16449bcae40a70e5c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 714a416ab95..6df778c997b 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1242,13 +1242,12 @@ static bool update_user_table(THD *thd, const char *host, const char *user, { /* The tables must be marked "updating" so that tables_ok() takes them into - account in tests. + account in tests. It's ok to leave 'updating' set after tables_ok. */ - tables.updating=1; + tables.updating= 1; /* Thanks to bzero, tables.next==0 */ if (!tables_ok(0, &tables)) DBUG_RETURN(0); - tables.updating=0; } #endif @@ -2138,10 +2137,9 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list, The tables must be marked "updating" so that tables_ok() takes them into account in tests. */ - tables[0].updating=tables[1].updating=tables[2].updating=1; + tables[0].updating= tables[1].updating= tables[2].updating= 1; if (!tables_ok(0, tables)) DBUG_RETURN(0); - tables[0].updating=tables[1].updating=tables[2].updating=0; } #endif @@ -2319,10 +2317,9 @@ int mysql_grant (THD *thd, const char *db, List <LEX_USER> &list, The tables must be marked "updating" so that tables_ok() takes them into account in tests. */ - tables[0].updating=tables[1].updating=1; + tables[0].updating= tables[1].updating= 1; if (!tables_ok(0, tables)) DBUG_RETURN(0); - tables[0].updating=tables[1].updating=0; } #endif |