← Back to branch summary

~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to response_time_distribution.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
response_time_distribution.patch
78
78
diff -ruN a/sql/handler.h b/sql/handler.h
79
79
--- a/sql/handler.h     2011-01-16 18:53:33.000000000 +0300
80
80
+++ b/sql/handler.h     2011-01-16 18:54:00.000000000 +0300
81
 
@@ -580,6 +580,7 @@
 
81
@@ -572,6 +572,7 @@
82
82
   SCH_PROFILES,
83
83
   SCH_REFERENTIAL_CONSTRAINTS,
84
84
   SCH_PROCEDURES,
109
109
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
110
110
 #include "../storage/perfschema/pfs_server.h"
111
111
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
112
 
@@ -603,7 +605,7 @@
 
112
@@ -604,7 +606,7 @@
113
113
 MY_LOCALE *my_default_lc_messages;
114
114
 MY_LOCALE *my_default_lc_time_names;
115
115
 
118
118
 SHOW_COMP_OPTION have_geometry, have_rtree_keys;
119
119
 SHOW_COMP_OPTION have_crypt, have_compress;
120
120
 SHOW_COMP_OPTION have_profiling;
121
 
@@ -904,6 +906,10 @@
 
121
@@ -905,6 +907,10 @@
122
122
 my_bool opt_enable_shared_memory;
123
123
 HANDLE smem_event_connect_request= 0;
124
124
 #endif
129
129
 
130
130
 my_bool opt_use_ssl  = 0;
131
131
 char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ssl_cert= NULL,
132
 
@@ -1472,6 +1478,9 @@
 
132
@@ -1473,6 +1479,9 @@
133
133
   my_free(opt_bin_logname);
134
134
   bitmap_free(&temp_pool);
135
135
   free_max_user_conn();
139
139
 #ifdef HAVE_REPLICATION
140
140
   end_slave_list();
141
141
 #endif
142
 
@@ -3925,6 +3934,9 @@
 
142
@@ -3944,6 +3953,9 @@
143
143
   if (!DEFAULT_ERRMSGS[0][0])
144
144
     unireg_abort(1);  
145
145
 
149
149
   /* We have to initialize the storage engines before CSV logging */
150
150
   if (ha_init())
151
151
   {
152
 
@@ -6797,6 +6809,11 @@
 
152
@@ -6819,6 +6831,11 @@
153
153
 #else
154
154
   have_query_cache=SHOW_OPTION_NO;
155
155
 #endif
741
741
 #include "lock.h"                           // MYSQL_OPEN_IGNORE_FLUSH
742
742
 #include "debug_sync.h"
743
743
 #include "datadict.h"   // dd_frm_type()
744
 
@@ -7688,6 +7689,14 @@
 
744
@@ -7689,6 +7690,14 @@
745
745
 
746
746
 */
747
747
 
756
756
 ST_SCHEMA_TABLE schema_tables[]=
757
757
 {
758
758
   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
759
 
@@ -7741,6 +7750,13 @@
 
759
@@ -7742,6 +7751,13 @@
760
760
    1, 9, 0, OPTIMIZE_I_S_TABLE|OPEN_TABLE_ONLY},
761
761
   {"ROUTINES", proc_fields_info, create_schema_table, 
762
762
    fill_schema_proc, make_proc_old_format, 0, -1, -1, 0, 0},