Commit c49687f3 authored by unknown's avatar unknown
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 238ed275 91a9b237

mysql-test/r/information_schema.result

+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ information_schema PARTITIONS PARTITION_EXPRESSION 
information_schema	PARTITIONS	SUBPARTITION_EXPRESSION

information_schema	PARTITIONS	PARTITION_DESCRIPTION

information_schema	PLUGINS	PLUGIN_DESCRIPTION

information_schema	PROCESSLIST	INFO

information_schema	ROUTINES	ROUTINE_DEFINITION

information_schema	ROUTINES	SQL_MODE

information_schema	TRIGGERS	ACTION_CONDITION

sql/mysql_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; 


/* Characters shown for the command in 'show processlist' */

#define PROCESS_LIST_WIDTH 100

/* Characters shown for the command in 'information_schema.processlist' */

#define PROCESS_LIST_INFO_WIDTH 65535



/* Time handling defaults */

#define TIMESTAMP_MAX_YEAR 2038

sql/sql_show.cc

+4 −7
Original line number Diff line number Diff line
@@ -1553,15 +1553,11 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) 
  TABLE *table= tables->table;

  CHARSET_INFO *cs= system_charset_info;

  char *user;

  bool verbose;

  ulong max_query_length;

  time_t now= time(0);

  DBUG_ENTER("fill_process_list");



  user= thd->security_ctx->master_access & PROCESS_ACL ?

        NullS : thd->security_ctx->priv_user;

  verbose= thd->lex->verbose;

  max_query_length= PROCESS_LIST_WIDTH;



  VOID(pthread_mutex_lock(&LOCK_thread_count));
@@ -1645,7 +1641,8 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) 
      if (tmp->query)

      {

        table->field[7]->store(tmp->query,

                               min(max_query_length, tmp->query_length), cs);

                               min(PROCESS_LIST_INFO_WIDTH,

                                   tmp->query_length), cs);

        table->field[7]->set_notnull();

      }
@@ -5165,9 +5162,9 @@ ST_FIELD_INFO processlist_fields_info[]= 
  {"HOST", LIST_PROCESS_HOST_LEN,  MYSQL_TYPE_STRING, 0, 0, "Host"},

  {"DB", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, "Db"},

  {"COMMAND", 16, MYSQL_TYPE_STRING, 0, 0, "Command"},

  {"TIME", 4, MYSQL_TYPE_LONG, 0, 0, "Time"},

  {"TIME", 7, MYSQL_TYPE_LONG, 0, 0, "Time"},

  {"STATE", 30, MYSQL_TYPE_STRING, 0, 1, "State"},

  {"INFO", PROCESS_LIST_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info"},

  {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info"},

  {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}

};