bk commit into 5.1 tree (cmiller:1.2482)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-29 14:31:57-04:00, cmiller@stripped +6 -0
  Fix up merge problems.

  sql/mysql_priv.h@stripped, 2007-10-29 14:31:51-04:00, cmiller@stripped +2 -1
    Add extern qualification to match implementation change.

  sql/mysqld.cc@stripped, 2007-10-29 14:31:51-04:00, cmiller@stripped +1 -2
    Add missing #endif, and move mispatched #endif.

  sql/sql_cache.cc@stripped, 2007-10-29 14:31:51-04:00, cmiller@stripped +0 -1
    Removing mispatched line.  Duplicated.

  sql/sql_profile.cc@stripped, 2007-10-29 14:31:52-04:00, cmiller@stripped +2 -2
    Struct renamed to typedef.

  sql/sql_profile.h@stripped, 2007-10-29 14:31:52-04:00, cmiller@stripped +2 -2
    Struct renamed to typedef.

  sql/sql_show.cc@stripped, 2007-10-29 14:31:52-04:00, cmiller@stripped +1 -1
    New field in initialization.

diff -Nrup a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h	2007-10-17 14:05:38 -04:00
+++ b/sql/mysql_priv.h	2007-10-29 14:31:51 -04:00
@@ -643,6 +643,7 @@ inline THD *_current_thd(void)
   The meat of thd_proc_info(THD*, char*), a macro that packs the last
   three calling-info parameters. 
 */
+extern "C"
 const char *set_thd_proc_info(THD *thd, const char *info, 
                               const char *calling_func, 
                               const char *calling_file, 
@@ -1904,7 +1905,7 @@ extern handlerton *myisam_hton;
 extern handlerton *heap_hton;
 
 extern SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen;
-uextern SHOW_COMP_OPTION have_query_cache;
+extern SHOW_COMP_OPTION have_query_cache;
 extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 extern SHOW_COMP_OPTION have_crypt;
 extern SHOW_COMP_OPTION have_compress;
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-10-17 14:05:38 -04:00
+++ b/sql/mysqld.cc	2007-10-29 14:31:51 -04:00
@@ -7185,18 +7185,17 @@ static void mysql_init_variables(void)
 			     "d:t:i:o,/tmp/mysqld.trace");
 #endif
   opt_error_log= IF_WIN(1,0);
-#endif
 #ifdef COMMUNITY_SERVER
     have_community_features = SHOW_OPTION_YES;
 #else
     have_community_features = SHOW_OPTION_NO;
+#endif
   global_system_variables.ndb_index_stat_enable=FALSE;
   max_system_variables.ndb_index_stat_enable=TRUE;
   global_system_variables.ndb_index_stat_cache_entries=32;
   max_system_variables.ndb_index_stat_cache_entries=~0L;
   global_system_variables.ndb_index_stat_update_freq=20;
   max_system_variables.ndb_index_stat_update_freq=~0L;
-#endif
 #ifdef HAVE_OPENSSL
   have_ssl=SHOW_OPTION_YES;
 #else
diff -Nrup a/sql/sql_cache.cc b/sql/sql_cache.cc
--- a/sql/sql_cache.cc	2007-10-17 14:05:39 -04:00
+++ b/sql/sql_cache.cc	2007-10-29 14:31:51 -04:00
@@ -1457,7 +1457,6 @@ void Query_cache::invalidate(CHANGED_TAB
 {
   THD *thd= current_thd;
   DBUG_ENTER("Query_cache::invalidate (changed table list)");
-  THD *thd= current_thd;
   for (; tables_used; tables_used= tables_used->next)
   {
     thd_proc_info(thd, "invalidating query cache entries (table list)");
diff -Nrup a/sql/sql_profile.cc b/sql/sql_profile.cc
--- a/sql/sql_profile.cc	2007-05-02 14:13:30 -04:00
+++ b/sql/sql_profile.cc	2007-10-29 14:31:52 -04:00
@@ -28,7 +28,7 @@ const char * const _unknown_func_ = "<un
 /**
   Connects Information_Schema and Profiling.
 */
-int fill_query_profile_statistics_info(THD *thd, struct st_table_list *tables, 
+int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables, 
                                        Item *cond)
 {
 #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
@@ -663,7 +663,7 @@ bool PROFILING::show_last(uint options)
 /**
   Fill the information schema table, "query_profile", as defined in show.cc .
 */
-int PROFILING::fill_statistics_info(THD *thd, struct st_table_list *tables, Item *cond)
+int PROFILING::fill_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond)
 {
   DBUG_ENTER("PROFILING::fill_statistics_info");
   TABLE *table= tables->table;
diff -Nrup a/sql/sql_profile.h b/sql/sql_profile.h
--- a/sql/sql_profile.h	2007-05-02 14:13:30 -04:00
+++ b/sql/sql_profile.h	2007-10-29 14:31:52 -04:00
@@ -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 */
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-10-17 14:05:39 -04:00
+++ b/sql/sql_show.cc	2007-10-29 14:31:52 -04:00
@@ -6492,7 +6492,7 @@ ST_SCHEMA_TABLE schema_tables[]=
   {"PROCESSLIST", processlist_fields_info, create_schema_table,
    fill_schema_processlist, make_old_format, 0, -1, -1, 0, 0},
   {"PROFILING", query_profile_statistics_info, create_schema_table,
-    fill_query_profile_statistics_info, NULL, NULL, -1, -1, false},
+    fill_query_profile_statistics_info, NULL, NULL, -1, -1, false, 0},
   {"REFERENTIAL_CONSTRAINTS", referential_constraints_fields_info,
    create_schema_table, get_all_tables, 0, get_referential_constraints_record,
    1, 9, 0, OPEN_TABLE_ONLY},