diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-09 14:44:03 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-09 14:44:03 +0200 |
| commit | 61f0e69cb60b9db858bad3b6de6fa0b8b2f03899 (patch) | |
| tree | d823a9d8db9cbcd5878af1651e74b2afa0277116 /sql/sql_acl.cc | |
| parent | 584ddfdab2316c0b0520c6903fe6bf4b8a435b0a (diff) | |
| download | mariadb-git-61f0e69cb60b9db858bad3b6de6fa0b8b2f03899.tar.gz | |
ufter revview fix (BUG#2120)
mysql-test/r/derived.result:
test of error handling in derived tables with UPDATE & DELETE
mysql-test/t/derived.test:
test of error handling in derived tables with UPDATE & DELETE
sql/mysql_priv.h:
opened tables counter added to avoid loop of tables calculating in lock_tables
sql/sql_acl.cc:
opened tables counter added to avoid loop of tables calculating in lock_tables, here it is just for compatibility
sql/sql_base.cc:
removed unneeded assignment
opened tables counter added to avoid loop of tables calculating in lock_tables
commentary fixed
sql/sql_derived.cc:
mysql_derived made static
variable res moved in place where it used
priveleges written in correct place
sql/sql_handler.cc:
opened tables counter added to avoid loop of tables calculating in lock_tables
sql/sql_parse.cc:
mistyping in commentary fixed
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 8ef6a32a430..21c57d79da4 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -173,7 +173,8 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) tables[0].lock_type=tables[1].lock_type=tables[2].lock_type=TL_READ; tables[0].db=tables[1].db=tables[2].db=thd->db; - if (open_tables(thd,tables)) + uint counter; + if (open_tables(thd, tables, &counter)) { sql_print_error("Fatal error: Can't open privilege tables: %s", thd->net.last_error); @@ -2524,7 +2525,8 @@ my_bool grant_init(THD *org_thd) tables[0].lock_type=tables[1].lock_type=TL_READ; tables[0].db=tables[1].db=thd->db; - if (open_tables(thd,tables)) + uint counter; + if (open_tables(thd, tables, &counter)) goto end; TABLE *ptr[2]; // Lock tables for quick update |