localize vars

[packages/mysql.git] / show_slave_status_nolock.patch

diff --git a/show_slave_status_nolock.patch b/show_slave_status_nolock.patch
index 279611cbba6ded9be8e8878165652b61f60e2dcd..32dcd7fe50f73194f030cc2f186f13949ad7f544 100644 (file)
--- a/show_slave_status_nolock.patch
+++ b/show_slave_status_nolock.patch
@@ -26,7 +26,7 @@
    { "NVARCHAR",               SYM(NVARCHAR_SYM)},
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -3121,6 +3121,7 @@
+@@ -2971,6 +2971,7 @@
    {"show_relaylog_events", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_RELAYLOG_EVENTS]), SHOW_LONG_STATUS},
    {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},
    {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
@@ -55,7 +55,7 @@
    sql_command_flags[SQLCOM_SHOW_CREATE_PROC]= CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]= CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
-@@ -2368,12 +2369,17 @@
+@@ -2393,12 +2394,17 @@
      mysql_mutex_unlock(&LOCK_active_mi);
      break;
    }
@@ -74,7 +74,7 @@
      if (active_mi != NULL)
      {
        res = show_master_info(thd, active_mi);
-@@ -2384,7 +2390,19 @@
+@@ -2409,7 +2415,19 @@
                     WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
        my_ok(thd);
      }
@@ -105,7 +105,7 @@
  %token  STDDEV_SAMP_SYM               /* SQL-2003-N */
  %token  STD_SYM
  %token  STOP_SYM
-@@ -11105,6 +11106,11 @@
+@@ -11111,6 +11112,11 @@
            {
              Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
            }