merge

myisam/ft_nlq_search.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 95a6ebb36fb..c2ebdeab5c2 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1253,7 +1253,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
 	!(thd->variables.sql_mode & MODE_MYSQL323) &&
 	!(thd->variables.sql_mode & MODE_MYSQL40))
     {
-      packet->append(" CHARSET=", 9);
+      packet->append(" DEFAULT CHARSET=", 17);
       packet->append(table->table_charset->csname);
       if (!(table->table_charset->state & MY_CS_PRIMARY))
       {
@@ -1589,6 +1589,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
   if (protocol->send_fields(&field_list,1))
     DBUG_RETURN(1); /* purecov: inspected */
   null_lex_str.str= 0;				// For sys_var->value_ptr()
+  null_lex_str.length= 0;
 
   pthread_mutex_lock(mutex);
   for (; variables->name; variables++)
@@ -1848,6 +1849,10 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
         break;
 
 #endif /* HAVE_OPENSSL */
+      case SHOW_KEY_CACHE_LONG:
+	value= (value-(char*) &dflt_key_cache_var)+ (char*) sql_key_cache;
+	end= int10_to_str(*(long*) value, buff, 10);
+        break;
       case SHOW_UNDEF:				// Show never happen
       case SHOW_SYS:
 	break;					// Return empty string