~percona-dev/percona-server/5.1.57-fix_bug_785564

« back to all changes in this revision

Viewing changes to show_slave_status_nolock.patch

  • Committer: Oleg Tsarev
  • Date: 2010-12-14 20:03:02 UTC
  • mfrom: (169 release-5.1.53-tmp)
  • mto: This revision was merged to the branch mainline in revision 171.
  • Revision ID: oleg.tsarev@percona.com-20101214200302-hmulr329e352xhaw
add --without-response_time_distribution

Show diffs side-by-side

added added

removed removed

Lines of Context:
29
29
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
30
30
--- a/sql/mysqld.cc     2010-11-17 18:45:47.000000000 +0300
31
31
+++ b/sql/mysqld.cc     2010-11-17 18:46:55.000000000 +0300
32
 
@@ -3248,6 +3248,7 @@
 
32
@@ -3252,6 +3252,7 @@
33
33
   {"show_profiles",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILES]), SHOW_LONG_STATUS},
34
34
   {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},
35
35
   {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
61
61
   sql_command_flags[SQLCOM_SHOW_CREATE_PROC]=  CF_STATUS_COMMAND;
62
62
   sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]=  CF_STATUS_COMMAND;
63
63
   sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
64
 
@@ -2539,12 +2540,16 @@
 
64
@@ -2545,12 +2546,16 @@
65
65
     pthread_mutex_unlock(&LOCK_active_mi);
66
66
     break;
67
67
   }
79
79
     if (active_mi != NULL)
80
80
     {
81
81
       res = show_master_info(thd, active_mi);
82
 
@@ -2555,7 +2560,10 @@
 
82
@@ -2561,7 +2566,10 @@
83
83
                    WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
84
84
       my_ok(thd);
85
85
     }