← Back to branch summary

~percona-dev/percona-server/release-5.1.51-12-bug_fix_658274

« back to all changes in this revision

Viewing changes to response-time-distribution.patch

  • Committer: Oleg Tsarev
  • Date: 2010-09-15 18:36:30 UTC
  • mfrom: (108.1.2 percona-server)
  • Revision ID: tsarev@percona-20100915183630-088jd9sdbqcloors
port tsarev's patches to 5.1.50

Show diffs side-by-side

added added

removed removed

Lines of Context:
response-time-distribution.patch
72
72
diff -Nur a/sql/Makefile.in b/sql/Makefile.in
73
73
--- a/sql/Makefile.in   2010-08-10 15:32:19.566991761 +0400
74
74
+++ b/sql/Makefile.in   2010-08-10 15:32:20.088242513 +0400
75
 
@@ -121,7 +121,7 @@
 
75
@@ -122,7 +122,7 @@
76
76
        sql_string.$(OBJEXT) sql_manager.$(OBJEXT) sql_map.$(OBJEXT) \
77
77
        mysqld.$(OBJEXT) password.$(OBJEXT) hash_filo.$(OBJEXT) \
78
78
        hostname.$(OBJEXT) sql_connect.$(OBJEXT) scheduler.$(OBJEXT) \
81
81
        sql_base.$(OBJEXT) table.$(OBJEXT) sql_select.$(OBJEXT) \
82
82
        sql_insert.$(OBJEXT) sql_profile.$(OBJEXT) \
83
83
        sql_prepare.$(OBJEXT) sql_error.$(OBJEXT) sql_locale.$(OBJEXT) \
84
 
@@ -564,7 +564,7 @@
 
84
@@ -567,7 +567,7 @@
85
85
                        sql_repl.h slave.h rpl_filter.h rpl_injector.h \
86
86
                        log_event.h rpl_record.h \
87
87
                        log_event_old.h rpl_record_old.h \
90
90
                        spatial.h gstream.h client_settings.h tzfile.h \
91
91
                        tztime.h my_decimal.h\
92
92
                        sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
93
 
@@ -587,7 +587,7 @@
 
93
@@ -590,7 +590,7 @@
94
94
                        sql_string.cc sql_manager.cc sql_map.cc \
95
95
                        mysqld.cc password.c hash_filo.cc hostname.cc \
96
96
                        sql_connect.cc scheduler.cc sql_parse.cc \
99
99
                        sql_base.cc table.cc sql_select.cc sql_insert.cc \
100
100
                        sql_profile.cc \
101
101
                        sql_prepare.cc sql_error.cc sql_locale.cc \
102
 
@@ -830,6 +830,7 @@
 
102
@@ -833,6 +833,7 @@
103
103
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/password.Po@am__quote@
104
104
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procedure.Po@am__quote@
105
105
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol.Po@am__quote@
144
144
 
145
145
   /* We have to initialize the storage engines before CSV logging */
146
146
   if (ha_init())
147
 
@@ -5883,6 +5889,8 @@
 
147
@@ -5895,6 +5901,8 @@
148
148
   OPT_USE_GLOBAL_LONG_QUERY_TIME,
149
149
   OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
150
150
   OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
153
153
   OPT_IGNORE_BUILTIN_INNODB,
154
154
   OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
155
155
   OPT_DEFAULT_CHARACTER_SET_OLD
156
 
@@ -6952,6 +6960,21 @@
 
156
@@ -6964,6 +6972,21 @@
157
157
    "Use microsecond time's precision in slow query log",
158
158
    (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
159
159
    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
547
547
diff -Nur a/sql/set_var.cc b/sql/set_var.cc
548
548
--- a/sql/set_var.cc    2010-08-10 15:32:19.556992443 +0400
549
549
+++ b/sql/set_var.cc    2010-08-10 15:32:20.098240993 +0400
550
 
@@ -1000,6 +1000,10 @@
 
550
@@ -1004,6 +1004,10 @@
551
551
 static sys_var_use_global_long_query_time sys_use_global_long_query_time;
552
552
 static sys_var_bool_ptr       sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
553
553
                                                        &opt_slow_query_log_microseconds_timestamp);
569
569
 
570
570
 /**
571
571
   @defgroup Runtime_Environment Runtime Environment
572
 
@@ -1744,23 +1745,31 @@
 
572
@@ -1749,23 +1750,31 @@
573
573
     Do not log administrative statements unless the appropriate option is
574
574
     set.
575
575
   */
615
615
     }
616
616
   }
617
617
   DBUG_VOID_RETURN;
618
 
@@ -1885,6 +1894,7 @@
 
618
@@ -1890,6 +1899,7 @@
619
619
   case SCH_CHARSETS:
620
620
   case SCH_ENGINES:
621
621
   case SCH_COLLATIONS:
623
623
   case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
624
624
   case SCH_USER_PRIVILEGES:
625
625
   case SCH_SCHEMA_PRIVILEGES:
626
 
@@ -7187,6 +7197,10 @@
 
626
@@ -7202,6 +7212,10 @@
627
627
     init_global_index_stats();
628
628
     pthread_mutex_unlock(&LOCK_global_index_stats);
629
629
   }
645
645
 #include "debug_sync.h"
646
646
 
647
647
 #define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
648
 
@@ -7432,6 +7433,13 @@
 
648
@@ -7467,6 +7468,13 @@
649
649
 
650
650
 */
651
651
 
659
659
 ST_SCHEMA_TABLE schema_tables[]=
660
660
 {
661
661
   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
662
 
@@ -7486,6 +7494,8 @@
 
662
@@ -7521,6 +7529,8 @@
663
663
    1, 9, 0, OPEN_TABLE_ONLY},
664
664
   {"ROUTINES", proc_fields_info, create_schema_table, 
665
665
    fill_schema_proc, make_proc_old_format, 0, -1, -1, 0, 0},
713
713
diff -Nur a/sql/table.h b/sql/table.h
714
714
--- a/sql/table.h       2010-08-10 15:32:19.556992443 +0400
715
715
+++ b/sql/table.h       2010-08-10 15:32:20.118244100 +0400
716
 
@@ -964,6 +964,7 @@
 
716
@@ -963,6 +963,7 @@
717
717
   SCH_PROFILES,
718
718
   SCH_REFERENTIAL_CONSTRAINTS,
719
719
   SCH_PROCEDURES,