← 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 innodb_fix_misc.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:
innodb_fix_misc.patch
91
91
 /********************************************************************//**
92
92
 Insert a compressed block into buf_pool->zip_clean in the LRU order. */
93
93
 UNIV_INTERN
94
 
@@ -1568,6 +1599,10 @@
 
94
@@ -1538,6 +1569,10 @@
95
95
                return(BUF_LRU_NOT_FREED);
96
96
        }
97
97
 
357
357
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
358
358
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-04 15:57:13.035513990 +0900
359
359
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-04 15:57:53.084513775 +0900
360
 
@@ -11919,6 +11919,12 @@
 
360
@@ -11980,6 +11980,12 @@
361
361
   "except for the deletion.",
362
362
   NULL, NULL, 0, &corrupt_table_action_typelib);
363
363
 
370
370
 static struct st_mysql_sys_var* innobase_system_variables[]= {
371
371
   MYSQL_SYSVAR(page_size),
372
372
   MYSQL_SYSVAR(log_block_size),
373
 
@@ -12009,6 +12015,7 @@
 
373
@@ -12070,6 +12076,7 @@
374
374
   MYSQL_SYSVAR(purge_threads),
375
375
   MYSQL_SYSVAR(purge_batch_size),
376
376
   MYSQL_SYSVAR(corrupt_table_action),
378
378
   NULL
379
379
 };
380
380
 
381
 
@@ -12018,7 +12025,7 @@
 
381
@@ -12079,7 +12086,7 @@
382
382
   &innobase_storage_engine,
383
383
   innobase_hton_name,
384
384
   "Innobase Oy",
396
396
        /* @} */
397
397
+       ibool           space_was_being_deleted;
398
398
        ibool           is_corrupt;
399
 
 # ifdef UNIV_DEBUG_FILE_ACCESSES
 
399
 # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
400
400
        ibool           file_page_was_freed;
401
401
diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
402
402
--- a/storage/innobase/include/buf0buf.ic       2011-02-23 19:00:48.130659154 +0900
522
522
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
523
523
--- a/storage/innobase/include/srv0srv.h        2011-02-23 19:00:48.212625715 +0900
524
524
+++ b/storage/innobase/include/srv0srv.h        2011-02-23 19:01:19.193655990 +0900
525
 
@@ -247,6 +247,8 @@
 
525
@@ -248,6 +248,8 @@
526
526
 
527
527
 extern ulint   srv_extra_rsegments;
528
528
 extern ulint   srv_dict_size_limit;
567
567
 
568
568
 #define REFMAN "http://dev.mysql.com/doc/refman/"      \
569
569
        IB_TO_STR(MYSQL_MAJOR_VERSION) "."              \
570
 
diff -ruN a/storage/innobase/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c
571
 
--- a/storage/innobase/mtr/mtr0log.c    2010-12-04 02:58:26.000000000 +0900
572
 
+++ b/storage/innobase/mtr/mtr0log.c    2011-02-03 15:17:14.000000000 +0900
573
 
@@ -408,7 +408,7 @@
574
 
        ptr += 2;
575
 
 
576
 
        if (UNIV_UNLIKELY(offset >= UNIV_PAGE_SIZE)
577
 
-                       || UNIV_UNLIKELY(len + offset) > UNIV_PAGE_SIZE) {
578
 
+                       || UNIV_UNLIKELY(len + offset > UNIV_PAGE_SIZE)) {
579
 
                recv_sys->found_corrupt_log = TRUE;
580
 
 
581
 
                return(NULL);
582
570
diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
583
571
--- a/storage/innobase/os/os0file.c     2011-02-23 19:00:47.928696481 +0900
584
572
+++ b/storage/innobase/os/os0file.c     2011-02-23 19:01:19.200696353 +0900
755
743
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
756
744
--- a/storage/innobase/srv/srv0srv.c    2011-02-23 19:00:48.283695497 +0900
757
745
+++ b/storage/innobase/srv/srv0srv.c    2011-02-23 19:01:19.204696643 +0900
758
 
@@ -442,6 +442,8 @@
 
746
@@ -446,6 +446,8 @@
759
747
 
760
748
 UNIV_INTERN ulint      srv_extra_rsegments = 127; /* extra rseg for users */
761
749
 UNIV_INTERN ulint      srv_dict_size_limit = 0;
767
755
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
768
756
--- a/storage/innobase/srv/srv0start.c  2010-12-04 15:57:13.073495392 +0900
769
757
+++ b/storage/innobase/srv/srv0start.c  2010-12-04 16:02:50.704884053 +0900
770
 
@@ -2153,7 +2153,7 @@
 
758
@@ -2156,7 +2156,7 @@
771
759
        if (srv_print_verbose_log) {
772
760
                ut_print_timestamp(stderr);
773
761
                fprintf(stderr,
779
767
diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
780
768
--- a/storage/innobase/sync/sync0sync.c 2011-02-25 14:18:55.817202060 +0900
781
769
+++ b/storage/innobase/sync/sync0sync.c 2011-02-25 14:19:44.596202017 +0900
782
 
@@ -1181,6 +1181,7 @@
 
770
@@ -1174,6 +1174,7 @@
783
771
        case SYNC_LOG_FLUSH_ORDER:
784
772
        case SYNC_THR_LOCAL:
785
773
        case SYNC_ANY_LATCH: