Commit 598b7631 authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
parents e3beea23 48e0630d

sql/mysql_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,6 @@ extern char language[FN_REFLEN], reg_ext[FN_EXTLEN]; 
extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];

extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file;

extern char log_error_file[FN_REFLEN], *opt_tc_log_file;

extern double last_query_cost;

extern double log_10[32];

extern ulonglong log_10_int[20];

extern ulonglong keybuff_size;

sql/mysqld.cc

+1 −2
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ ulong thread_id=1L,current_pid; 
ulong slow_launch_threads = 0, sync_binlog_period;

ulong expire_logs_days = 0;

ulong rpl_recovery_rank=0;

double last_query_cost= -1; /* -1 denotes that no query was compiled yet */



double log_10[32];			/* 10 potences */

time_t start_time;
@@ -5727,7 +5726,7 @@ struct show_var_st status_vars[]= { 
  {"Key_reads",                (char*) &dflt_key_cache_var.global_cache_read, SHOW_KEY_CACHE_LONG},

  {"Key_write_requests",       (char*) &dflt_key_cache_var.global_cache_w_requests, SHOW_KEY_CACHE_LONG},

  {"Key_writes",               (char*) &dflt_key_cache_var.global_cache_write, SHOW_KEY_CACHE_LONG},

  {"Last_query_cost",          (char*) &last_query_cost,        SHOW_DOUBLE},

  {"Last_query_cost",          (char*) offsetof(STATUS_VAR, last_query_cost), SHOW_DOUBLE_STATUS},

  {"Max_used_connections",     (char*) &max_used_connections,  SHOW_LONG},

#ifdef HAVE_NDBCLUSTER_DB

  {"Ndb_",                     (char*) &ndb_status_variables,   SHOW_VARS},

sql/sql_class.cc

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var) 


  while (to != end)

    *(to++)+= *(from++);

  /* it doesn't make sense to add last_query_cost values */

}

sql/sql_class.h

+2 −0
Original line number Diff line number Diff line
@@ -635,6 +635,8 @@ typedef struct system_status_var 
  ulong filesort_range_count;

  ulong filesort_rows;

  ulong filesort_scan_count;



  double last_query_cost;

} STATUS_VAR;



/*

sql/sql_select.cc

+1 −2
Original line number Diff line number Diff line
@@ -3796,8 +3796,7 @@ choose_plan(JOIN *join, table_map join_tables) 
    Don't update last_query_cost for 'show status' command

  */

  if (join->thd->lex->orig_sql_command != SQLCOM_SHOW_STATUS)

    last_query_cost= join->best_read;



    join->thd->status_var.last_query_cost= join->best_read;

  DBUG_VOID_RETURN;

}