summaryrefslogtreecommitdiff
path: root/sql/sql_handler.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-02-09 14:44:03 +0200
committerunknown <bell@sanja.is.com.ua>2004-02-09 14:44:03 +0200
commit61f0e69cb60b9db858bad3b6de6fa0b8b2f03899 (patch)
treed823a9d8db9cbcd5878af1651e74b2afa0277116 /sql/sql_handler.cc
parent584ddfdab2316c0b0520c6903fe6bf4b8a435b0a (diff)
downloadmariadb-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_handler.cc')
-rw-r--r--sql/sql_handler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 405cfdb5bdc..897aa37ba11 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -48,7 +48,8 @@ static TABLE **find_table_ptr_by_name(THD *thd,const char *db,
int mysql_ha_open(THD *thd, TABLE_LIST *tables)
{
HANDLER_TABLES_HACK(thd);
- int err=open_tables(thd,tables);
+ uint counter;
+ int err=open_tables(thd, tables, &counter);
HANDLER_TABLES_HACK(thd);
if (err)
return -1;