database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-24 14:48:09 +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.
This commit is contained in:
cmiller@zippy.cornsilk.net
2007-10-31 16:39:59 -04:00
parent 44ba122726
commit 872d65a547
6 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_profile.h
View File

@@ -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 */