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/mysql_priv.h | |
| 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/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4d03feae07c..73e30e72a3c 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -675,10 +675,10 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); int setup_ftfuncs(SELECT_LEX* select); int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order); void wait_for_refresh(THD *thd); -int open_tables(THD *thd,TABLE_LIST *tables); +int open_tables(THD *thd, TABLE_LIST *tables, uint *counter); int simple_open_n_lock_tables(THD *thd,TABLE_LIST *tables); int open_and_lock_tables(THD *thd,TABLE_LIST *tables); -int lock_tables(THD *thd,TABLE_LIST *tables); +int lock_tables(THD *thd, TABLE_LIST *tables, uint counter); TABLE *open_temporary_table(THD *thd, const char *path, const char *db, const char *table_name, bool link_in_list); bool rm_temporary_table(enum db_type base, char *path); |