diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 36fc315c3c0..312f665e22f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1048,7 +1048,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;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 90d4f9b9a99..e45a61b0c04 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -345,7 +345,6 @@ ulong expire_logs_days = 0;
 ulong rpl_recovery_rank=0;
 ulong my_bind_addr;			/* the address we bind to */
 volatile ulong cached_thread_count= 0;
-double last_query_cost= -1; /* -1 denotes that no query was compiled yet */
 
 double log_10[32];			/* 10 potences */
 time_t start_time;
@@ -5714,7 +5713,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},
   {"Max_used_connections",     (char*) &max_used_connections,  SHOW_LONG},
 #ifdef HAVE_NDBCLUSTER_DB
   {"Ndb_",                     (char*) &ndb_status_variables,   SHOW_VARS},
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index a6a1f4d60ef..8a43d80ba52 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -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 */
 }
 
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 4393da6df2a..f1f0cc2bde5 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -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;
 
 /*
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 25bd99ee194..7ccb67be9d3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3739,8 +3739,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;
 }
 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 9e3f82f9fd6..a5d12dffc4b 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1358,6 +1358,7 @@ static bool show_status_array(THD *thd, const char *wild,
         }
         case SHOW_DOUBLE:
         {
+          value= ((char *) status_var + (ulong) value);
           end= buff + sprintf(buff, "%f", *(double*) value);
           break;
         }