summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-09-21 21:36:23 +0300
committerunknown <monty@mashka.mysql.fi>2002-09-21 21:36:23 +0300
commitb804e278c876314de8ff5ae10fc54ea68ca06070 (patch)
tree082d99e224788fa31d6922be2343af244c44aed6 /sql/lock.cc
parente4860747ebc5fddac571526d7c9c5e3f7452ab85 (diff)
downloadmariadb-git-b804e278c876314de8ff5ae10fc54ea68ca06070.tar.gz
Change name -> alias in TABLE_LIST.
Added missing mutex-lock around critical section in GRANT handling. Docs/manual.texi: ChangeLog sql/lock.cc: Change name -> alias in TABLE_LIST. sql/slave.cc: Change name -> alias in TABLE_LIST. sql/sql_acl.cc: Added missing mutex-lock around critical section in GRANT handling. Changed name -> alias sql/sql_base.cc: Change name -> alias in TABLE_LIST. sql/sql_insert.cc: Change name -> alias in TABLE_LIST. sql/sql_parse.cc: Change name -> alias in TABLE_LIST. sql/sql_show.cc: Change name -> alias in TABLE_LIST. sql/sql_table.cc: Change name -> alias in TABLE_LIST. sql/sql_udf.cc: Change name -> alias in TABLE_LIST. sql/table.h: Change name -> alias in TABLE_LIST. tests/grant.pl: Fixed grant test
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index a9054b99186..84d10d61366 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -419,7 +419,7 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
uint key_length;
DBUG_ENTER("lock_table_name");
- key_length=(uint) (strmov(strmov(key,table_list->db)+1,table_list->name)
+ key_length=(uint) (strmov(strmov(key,table_list->db)+1,table_list->real_name)
-key)+ 1;
/* Only insert the table if we haven't insert it already */
@@ -447,7 +447,7 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
my_free((gptr) table,MYF(0));
DBUG_RETURN(-1);
}
- if (remove_table_from_cache(thd, table_list->db, table_list->name))
+ if (remove_table_from_cache(thd, table_list->db, table_list->real_name))
DBUG_RETURN(1); // Table is in use
DBUG_RETURN(0);
}