← Back to branch summary

~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

« back to all changes in this revision

Viewing changes to innodb_fix_misc.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 11:57:42 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510115742-3i3194rn2m8fipm2
port Yasufumi patches to 5.5.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_fix_misc.patch
13
13
diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
14
14
--- a/storage/innobase/buf/buf0buf.c    2011-02-23 19:00:48.178696354 +0900
15
15
+++ b/storage/innobase/buf/buf0buf.c    2011-02-23 19:01:19.138826278 +0900
16
 
@@ -4046,6 +4046,7 @@
 
16
@@ -4063,6 +4063,7 @@
17
17
                bpage->state    = BUF_BLOCK_ZIP_PAGE;
18
18
                bpage->space    = space;
19
19
                bpage->offset   = offset;
50
50
diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
51
51
--- a/storage/innobase/buf/buf0lru.c    2011-02-23 19:00:47.939695791 +0900
52
52
+++ b/storage/innobase/buf/buf0lru.c    2011-02-23 19:01:19.142741970 +0900
53
 
@@ -554,6 +554,37 @@
 
53
@@ -574,6 +574,37 @@
54
54
        }
55
55
 }
56
56
 
88
88
 /********************************************************************//**
89
89
 Insert a compressed block into buf_pool->zip_clean in the LRU order. */
90
90
 UNIV_INTERN
91
 
@@ -1538,6 +1569,10 @@
 
91
@@ -1558,6 +1589,10 @@
92
92
                return(BUF_LRU_NOT_FREED);
93
93
        }
94
94
 
206
206
 
207
207
        fil_flush(space_id);
208
208
 
209
 
@@ -4863,6 +4880,22 @@
 
209
@@ -4861,6 +4878,22 @@
210
210
                srv_data_written+= len;
211
211
        }
212
212
 
229
229
        /* Reserve the fil_system mutex and make sure that we can open at
230
230
        least one file while holding it, if the file is not already open */
231
231
 
232
 
@@ -4992,10 +5025,24 @@
 
232
@@ -4990,10 +5023,24 @@
233
233
 #else
234
234
        /* Queue the aio request */
235
235
        ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
255
255
        ut_a(ret);
256
256
 
257
257
        if (mode == OS_AIO_SYNC) {
258
 
@@ -5095,6 +5142,7 @@
 
258
@@ -5093,6 +5140,7 @@
259
259
        fil_node_t*     fil_node;
260
260
        void*           message;
261
261
        ulint           type;
263
263
 
264
264
        ut_ad(fil_validate_skip());
265
265
 
266
 
@@ -5102,10 +5150,10 @@
 
266
@@ -5100,10 +5148,10 @@
267
267
                srv_set_io_thread_op_info(segment, "native aio handle");
268
268
 #ifdef WIN_ASYNC_IO
269
269
                ret = os_aio_windows_handle(segment, 0, &fil_node,
276
276
 #else
277
277
                ret = 0; /* Eliminate compiler warning */
278
278
                ut_error;
279
 
@@ -5114,7 +5162,22 @@
 
279
@@ -5112,7 +5160,22 @@
280
280
                srv_set_io_thread_op_info(segment, "simulated aio handle");
281
281
 
282
282
                ret = os_aio_simulated_handle(segment, &fil_node,
303
303
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
304
304
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-04 15:57:13.035513990 +0900
305
305
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-04 15:57:53.084513775 +0900
306
 
@@ -11986,6 +11986,12 @@
 
306
@@ -11999,6 +11999,12 @@
307
307
   "except for the deletion.",
308
308
   NULL, NULL, 0, &corrupt_table_action_typelib);
309
309
 
316
316
 static struct st_mysql_sys_var* innobase_system_variables[]= {
317
317
   MYSQL_SYSVAR(page_size),
318
318
   MYSQL_SYSVAR(log_block_size),
319
 
@@ -12076,6 +12082,7 @@
 
319
@@ -12089,6 +12095,7 @@
320
320
   MYSQL_SYSVAR(purge_batch_size),
321
321
   MYSQL_SYSVAR(rollback_segments),
322
322
   MYSQL_SYSVAR(corrupt_table_action),
324
324
   NULL
325
325
 };
326
326
 
327
 
@@ -12085,7 +12092,7 @@
 
327
@@ -12098,7 +12105,7 @@
328
328
   &innobase_storage_engine,
329
329
   innobase_hton_name,
330
 
   "Innobase Oy",
 
330
   plugin_author,
331
331
-  "Supports transactions, row-level locking, and foreign keys",
332
332
+  "Percona-XtraDB, Supports transactions, row-level locking, and foreign keys",
333
333
   PLUGIN_LICENSE_GPL,
336
336
diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
337
337
--- a/storage/innobase/include/buf0buf.h        2011-02-23 19:00:48.252696774 +0900
338
338
+++ b/storage/innobase/include/buf0buf.h        2011-02-23 19:01:19.182655902 +0900
339
 
@@ -1437,6 +1437,7 @@
 
339
@@ -1439,6 +1439,7 @@
340
340
                                        0 if the block was never accessed
341
341
                                        in the buffer pool */
342
342
        /* @} */
480
480
diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
481
481
--- a/storage/innobase/include/sync0sync.h      2011-02-23 19:00:47.875625940 +0900
482
482
+++ b/storage/innobase/include/sync0sync.h      2011-02-23 19:01:19.195703856 +0900
483
 
@@ -683,6 +683,7 @@
 
483
@@ -682,6 +682,7 @@
484
484
 #define        SYNC_BUF_POOL           150     /* Buffer pool mutex */
485
485
 #define        SYNC_BUF_FLUSH_LIST     145     /* Buffer flush list mutex */
486
486
 #define SYNC_DOUBLEWRITE       140
689
689
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
690
690
--- a/storage/innobase/srv/srv0srv.c    2011-02-23 19:00:48.283695497 +0900
691
691
+++ b/storage/innobase/srv/srv0srv.c    2011-02-23 19:01:19.204696643 +0900
692
 
@@ -448,6 +448,8 @@
 
692
@@ -447,6 +447,8 @@
693
693
 UNIV_INTERN ulint      srv_pass_corrupt_table = 0; /* 0:disable 1:enable */
694
694
 
695
695
 UNIV_INTERN ulint      srv_dict_size_limit = 0;
701
701
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
702
702
--- a/storage/innobase/srv/srv0start.c  2010-12-04 15:57:13.073495392 +0900
703
703
+++ b/storage/innobase/srv/srv0start.c  2010-12-04 16:02:50.704884053 +0900
704
 
@@ -2162,7 +2162,7 @@
 
704
@@ -2161,7 +2161,7 @@
705
705
        if (srv_print_verbose_log) {
706
706
                ut_print_timestamp(stderr);
707
707
                fprintf(stderr,
713
713
diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
714
714
--- a/storage/innobase/sync/sync0sync.c 2011-02-25 14:18:55.817202060 +0900
715
715
+++ b/storage/innobase/sync/sync0sync.c 2011-02-25 14:19:44.596202017 +0900
716
 
@@ -1174,6 +1174,7 @@
 
716
@@ -1175,6 +1175,7 @@
717
717
        case SYNC_LOG_FLUSH_ORDER:
718
718
        case SYNC_THR_LOCAL:
719
719
        case SYNC_ANY_LATCH: