database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Sundry changes to fix merge problems. Most of these are duplicated

Browse Source 
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.
This commit is contained in:
unknown
2007-10-31 16:39:59 -04:00
parent 41a9bb8c63
commit fc70ac4627
6 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_cache.cc
View File

@@ -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)