- rel 2; patches updated

[packages/mysql.git] / microsec_process.patch

diff --git a/microsec_process.patch b/microsec_process.patch
index 00da221aa3de310fdddad88b4ace626cd04e3491..4a17c29921e0ac3f9e4414673d13dad6e0ce401a 100644 (file)
--- a/microsec_process.patch
+++ b/microsec_process.patch
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN /dev/null b/patch_info/microsec_process.info
---- /dev/null  1970-01-01 09:00:00.000000000 +0900
-+++ b/patch_info/microsec_process.info 2010-12-02 20:41:41.616069579 +0900
+--- /dev/null
++++ b/patch_info/microsec_process.info
 @@ -0,0 +1,8 @@
 +File=microsec_process.patch
 +Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column
@@ -17,10 +16,9 @@ diff -ruN /dev/null b/patch_info/microsec_process.info
 +Comment=
 +2010-01
 +Ported to 5.1.42
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc  2010-12-02 19:22:40.054024541 +0900
-+++ b/sql/sql_show.cc  2010-12-02 20:41:41.622941425 +0900
-@@ -1882,7 +1882,8 @@
+--- a/sql/sql_show.cc
++++ b/sql/sql_show.cc
+@@ -1890,7 +1890,8 @@
    TABLE *table= tables->table;
    CHARSET_INFO *cs= system_charset_info;
    char *user;
@@ -30,7 +28,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
    DBUG_ENTER("fill_process_list");
  
    user= thd->security_ctx->master_access & PROCESS_ACL ?
-@@ -1966,6 +1967,10 @@
+@@ -1974,6 +1975,10 @@
        }
        mysql_mutex_unlock(&tmp->LOCK_thd_data);
  
@@ -41,7 +39,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
        if (schema_table_store_record(thd, table))
        {
          mysql_mutex_unlock(&LOCK_thread_count);
-@@ -7220,6 +7225,8 @@
+@@ -7464,6 +7469,8 @@
    {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE},
    {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info",
     SKIP_OPEN_TABLE},