- rel 0.5 (consider this to be test before rel 1); update percona patches; drop obsol...

[packages/mysql.git] / microsec_process.patch

diff --git a/mysql-microsec_process.patch b/microsec_process.patch
similarity index 74%
rename from mysql-microsec_process.patch
rename to microsec_process.patch
index cad8a8d2cd36cfa389f61428c261ba0e29f37dbc..00da221aa3de310fdddad88b4ace626cd04e3491 100644 (file)
--- a/mysql-microsec_process.patch
+++ b/microsec_process.patch
@@ -5,9 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info
+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-08-27 14:45:52.941058849 +0900
++++ b/patch_info/microsec_process.info 2010-12-02 20:41:41.616069579 +0900
 @@ -0,0 +1,8 @@
 +File=microsec_process.patch
 +Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column
@@ -18,9 +18,9 @@ diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info
 +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-08-27 14:38:08.781057666 +0900
-+++ b/sql/sql_show.cc  2010-08-27 14:45:52.946058726 +0900
-@@ -1919,7 +1919,8 @@
+--- 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 @@
    TABLE *table= tables->table;
    CHARSET_INFO *cs= system_charset_info;
    char *user;
@@ -30,9 +30,9 @@ 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 ?
-@@ -2024,6 +2025,10 @@
+@@ -1966,6 +1967,10 @@
        }
-       pthread_mutex_unlock(&tmp->LOCK_thd_data);
+       mysql_mutex_unlock(&tmp->LOCK_thd_data);
  
 +      /* TIME_MS */
 +      table->field[8]->store(((tmp->start_utime ?
@@ -40,8 +40,8 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
 +
        if (schema_table_store_record(thd, table))
        {
-         VOID(pthread_mutex_unlock(&LOCK_thread_count));
-@@ -6695,6 +6700,8 @@
+         mysql_mutex_unlock(&LOCK_thread_count);
+@@ -7220,6 +7225,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},