summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-10-31 16:39:59 -0400
committerunknown <cmiller@zippy.cornsilk.net>2007-10-31 16:39:59 -0400
commitfc70ac4627c4d7094dc1c1b4d6d61ab81fcd5546 (patch)
tree2d672702cc1c3fe78fd5fb908a40ab5b38eff83e /sql/sql_cache.cc
parent41a9bb8c636a2f99248f77f6af6c88d97b72d3b2 (diff)
downloadmariadb-git-fc70ac4627c4d7094dc1c1b4d6d61ab81fcd5546.tar.gz
Sundry changes to fix merge problems. Most of these are duplicated
in 5.0-community, but pulling to merge was very hard. sql/mysql_priv.h: Add new extern "C" qualification to set_thd_proc_info(). Fix typo in merge. sql/mysqld.cc: Replace obselete gptr with uchar* . Add missing #endif from merge problem. sql/set_var.cc: Include new parameter to user variable contruction. sql/sql_cache.cc: Remove duplicate line from merge problem. sql/sql_profile.cc: struct st_table_list is now typedef'd to a new name. ST_FIELD_INFO now includes a new member, a pointer to an open_table function. sql/sql_profile.h: struct st_table_list is now typedef'd to a new name.
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r--sql/sql_cache.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 9bb35e4371c..0fd5527495a 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1455,7 +1455,6 @@ void Query_cache::invalidate(THD *thd, TABLE_LIST *tables_used,
void Query_cache::invalidate(CHANGED_TABLE_LIST *tables_used)
{
- THD *thd= current_thd;
DBUG_ENTER("Query_cache::invalidate (changed table list)");
THD *thd= current_thd;
for (; tables_used; tables_used= tables_used->next)