• unknown's avatar
    Sundry changes to fix merge problems. Most of these are duplicated · fc70ac46
    unknown authored
    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.
    fc70ac46
sql_profile.cc 24.4 KB