diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-10-31 16:39:59 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-10-31 16:39:59 -0400 |
| commit | fc70ac4627c4d7094dc1c1b4d6d61ab81fcd5546 (patch) | |
| tree | 2d672702cc1c3fe78fd5fb908a40ab5b38eff83e /sql/sql_profile.h | |
| parent | 41a9bb8c636a2f99248f77f6af6c88d97b72d3b2 (diff) | |
| download | mariadb-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_profile.h')
| -rw-r--r-- | sql/sql_profile.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |