← Back to branch summary

~vlad-lesin/percona-server/pintables

« back to all changes in this revision

Viewing changes to sql_no_fcache.patch

  • Committer: Laurynas Biveinis
  • Date: 2011-06-21 02:36:36 UTC
  • mfrom: (123 merge)
  • mto: This revision was merged to the branch mainline in revision 124.
  • Revision ID: laurynas.biveinis@percona.com-20110621023636-ccp1iyyrncj181zt
Merge from lp:percona-server

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql_no_fcache.patch
144
144
diff -ruN a/sql/mysqld.h b/sql/mysqld.h
145
145
--- a/sql/mysqld.h      2011-04-09 18:48:55.000000000 +0400
146
146
+++ b/sql/mysqld.h      2011-04-09 18:48:58.000000000 +0400
147
 
@@ -193,6 +193,8 @@
148
 
 extern ulong back_log;
 
147
@@ -194,6 +194,8 @@
149
148
 extern char language[FN_REFLEN];
150
 
 extern ulong server_id, concurrency;
 
149
 extern "C" MYSQL_PLUGIN_IMPORT ulong server_id;
 
150
 extern ulong concurrency;
151
151
+/* flashcache */
152
152
+extern int cachedev_fd;
153
153
 extern time_t server_start_time, flush_status_time;
168
168
 
169
169
 #include <thr_alarm.h>
170
170
 #include <ft_global.h>
171
 
@@ -486,6 +491,11 @@
 
171
@@ -482,6 +487,11 @@
172
172
 ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
173
173
 ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
174
174
 ulong max_connections, max_connect_errors;
180
180
 /*
181
181
   Maximum length of parameter value which can be set through
182
182
   mysql_send_long_data() call.
183
 
@@ -4206,6 +4216,97 @@
 
183
@@ -4202,6 +4212,97 @@
184
184
 #define decrement_handler_count()
185
185
 #endif /* defined(_WIN32) || defined(HAVE_SMEM) */
186
186
 
278
278
 
279
279
 #ifndef EMBEDDED_LIBRARY
280
280
 #ifndef DBUG_OFF
281
 
@@ -4464,6 +4565,10 @@
 
281
@@ -4460,6 +4561,10 @@
282
282
   test_lc_time_sz();
283
283
 #endif
284
284
 
289
289
   /*
290
290
     We have enough space for fiddling with the argv, continue
291
291
   */
292
 
@@ -4667,6 +4772,10 @@
 
292
@@ -4663,6 +4768,10 @@
293
293
   }
294
294
 #endif
295
295
   clean_up(1);
300
300
   mysqld_exit(0);
301
301
 }
302
302
 
303
 
@@ -6500,6 +6609,7 @@
 
303
@@ -6496,6 +6605,7 @@
304
304
   {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
305
305
   {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_NOFLUSH},
306
306
   {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},