localize vars

[packages/mysql.git] / sql_no_fcache.patch

diff --git a/sql_no_fcache.patch b/sql_no_fcache.patch
index 059ff867859fcc370010deef83af8a39f474695c..930a0c1438bcb5de03f26fae0cb4c4b0074048d3 100644 (file)
--- a/sql_no_fcache.patch
+++ b/sql_no_fcache.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/client/mysqldump.c
 +++ b/client/mysqldump.c
-@@ -141,6 +141,8 @@
+@@ -143,6 +143,8 @@
  static uint opt_protocol= 0;
  static char *opt_plugin_dir= 0, *opt_default_auth= 0;
  
@@ -16,7 +16,7 @@
  /*
  Dynamic_string wrapper functions. In this file use these
  wrappers, they will terminate the process if there is
-@@ -1494,6 +1496,17 @@
+@@ -1496,6 +1498,17 @@
      /* Don't switch charsets for 4.1 and earlier.  (bug#34192). */
      server_supports_switching_charsets= FALSE;
    } 
@@ -34,7 +34,7 @@
    /*
      As we're going to set SQL_MODE, it would be lost on reconnect, so we
      cannot reconnect.
-@@ -3175,7 +3188,12 @@
+@@ -3177,7 +3190,12 @@
  
      /* now build the query string */
  
@@ -48,7 +48,7 @@
      dynstr_append_checked(&query_string, filename);
      dynstr_append_checked(&query_string, "'");
  
-@@ -3225,7 +3243,12 @@
+@@ -3227,7 +3245,12 @@
        check_io(md_result_file);
      }
      
@@ -139,7 +139,7 @@
    { "SQL_TSI_SECOND",   SYM(SECOND_SYM)},
 --- a/sql/mysqld.h
 +++ b/sql/mysqld.h
-@@ -194,6 +194,8 @@
+@@ -195,6 +195,8 @@
  extern char language[FN_REFLEN];
  extern "C" MYSQL_PLUGIN_IMPORT ulong server_id;
  extern ulong concurrency;
@@ -162,7 +162,7 @@
  
  #include <thr_alarm.h>
  #include <ft_global.h>
-@@ -487,6 +492,11 @@
+@@ -491,6 +496,11 @@
  ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
  ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
  ulong max_connections, max_connect_errors;
@@ -174,7 +174,7 @@
  /*
    Maximum length of parameter value which can be set through
    mysql_send_long_data() call.
-@@ -4252,6 +4262,97 @@
+@@ -4102,6 +4112,97 @@
  #define decrement_handler_count()
  #endif /* defined(_WIN32) || defined(HAVE_SMEM) */
  
@@ -272,7 +272,7 @@
  
  #ifndef EMBEDDED_LIBRARY
  #ifndef DBUG_OFF
-@@ -4510,6 +4611,10 @@
+@@ -4363,6 +4464,10 @@
    test_lc_time_sz();
  #endif
  
@@ -283,7 +283,7 @@
    /*
      We have enough space for fiddling with the argv, continue
    */
-@@ -4713,6 +4818,10 @@
+@@ -4574,6 +4679,10 @@
    }
  #endif
    clean_up(1);
@@ -294,7 +294,7 @@
    mysqld_exit(0);
  }
  
-@@ -6557,6 +6666,7 @@
+@@ -6421,6 +6530,7 @@
    {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
    {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_NOFLUSH},
    {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},
@@ -304,7 +304,7 @@
    {"Handler_delete",           (char*) offsetof(STATUS_VAR, ha_delete_count), SHOW_LONG_STATUS},
 --- a/sql/sql_lex.cc
 +++ b/sql/sql_lex.cc
-@@ -384,6 +384,7 @@
+@@ -390,6 +390,7 @@
    lex->describe= 0;
    lex->subqueries= FALSE;
    lex->context_analysis_only= 0;
@@ -314,7 +314,7 @@
    lex->leaf_tables_insert= 0;
 --- a/sql/sql_lex.h
 +++ b/sql/sql_lex.h
-@@ -2298,6 +2298,7 @@
+@@ -2346,6 +2346,7 @@
  
    enum enum_yes_no_unknown tx_chain, tx_release;
    bool safe_to_cache_query;
@@ -378,7 +378,7 @@
  %token  SQL_SMALL_RESULT
  %token  SQL_SYM                       /* SQL-2003-R */
  %token  SQL_THREAD
-@@ -7353,6 +7354,10 @@
+@@ -7362,6 +7363,10 @@
                Lex->select_lex.sql_cache= SELECT_LEX::SQL_NO_CACHE;
              }
            }