From fc70ac4627c4d7094dc1c1b4d6d61ab81fcd5546 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 31 Oct 2007 16:39:59 -0400 Subject: 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. --- sql/sql_profile.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/sql_profile.h') diff --git a/sql/sql_profile.h b/sql/sql_profile.h index a398c3d7a94..7d2fbb7827d 100644 --- a/sql/sql_profile.h +++ b/sql/sql_profile.h @@ -38,7 +38,7 @@ extern const char * const _unknown_func_; #endif extern ST_FIELD_INFO query_profile_statistics_info[]; -int fill_query_profile_statistics_info(THD *thd, struct st_table_list *tables, Item *cond); +int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond); #define PROFILE_NONE 0 @@ -322,7 +322,7 @@ public: bool show_last(uint options); /* ... from INFORMATION_SCHEMA.PROFILING ... */ - int fill_statistics_info(THD *thd, struct st_table_list *tables, Item *cond); + int fill_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond); }; # endif /* HAVE_PROFILING */ -- cgit v1.2.1