← Back to branch summary

~tsarev/percona-server/5.1.59-porting-bad

« back to all changes in this revision

Viewing changes to innodb_extend_slow.patch

  • Committer: kinoyasu
  • Date: 2011-07-07 13:02:19 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: kinoyasu@gauntlet4-20110707130219-bev0gkkvwkh47u4m
Yasufumi patches are ported to 5.1.58. Removing/changing the patch files against my intention is not allowed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_extend_slow.patch
428
428
 /*********************************************************************//**
429
429
 Construct ha_innobase handler. */
430
430
 UNIV_INTERN
431
 
@@ -9030,6 +9066,25 @@
 
431
@@ -9024,6 +9060,25 @@
432
432
        statement has ended */
433
433
 
434
434
        if (trx->n_mysql_tables_in_use == 0) {
588
588
diff -ruN a/storage/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h
589
589
--- a/storage/innodb_plugin/include/trx0trx.h   2010-08-27 16:08:45.301058614 +0900
590
590
+++ b/storage/innodb_plugin/include/trx0trx.h   2010-08-27 16:30:47.369989369 +0900
591
 
@@ -738,6 +738,17 @@
 
591
@@ -749,6 +749,17 @@
592
592
        /*------------------------------*/
593
593
        char detailed_error[256];       /*!< detailed error message for last
594
594
                                        error, or empty. */
863
863
diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
864
864
--- a/storage/innodb_plugin/trx/trx0trx.c       2010-08-27 16:08:45.306058896 +0900
865
865
+++ b/storage/innodb_plugin/trx/trx0trx.c       2010-08-27 16:30:47.387058330 +0900
866
 
@@ -179,6 +179,15 @@
 
866
@@ -182,6 +182,15 @@
867
867
        trx->global_read_view = NULL;
868
868
        trx->read_view = NULL;
869
869
 
879
879
        /* Set X/Open XA transaction identification to NULL */
880
880
        memset(&trx->xid, 0, sizeof(trx->xid));
881
881
        trx->xid.formatID = -1;
882
 
@@ -216,6 +225,11 @@
 
882
@@ -219,6 +228,11 @@
883
883
 
884
884
        trx->mysql_process_no = os_proc_get_number();
885
885
 
891
891
        return(trx);
892
892
 }
893
893
 
894
 
@@ -347,6 +361,12 @@
 
894
@@ -404,6 +418,12 @@
895
895
 /*===============*/
896
896
        trx_t*  trx)    /*!< in, own: trx object */
897
897
 {
904
904
        mutex_enter(&kernel_mutex);
905
905
 
906
906
        UT_LIST_REMOVE(mysql_trx_list, trx_sys->mysql_trx_list, trx);
907
 
@@ -368,6 +388,12 @@
 
907
@@ -425,6 +445,12 @@
908
908
 /*====================*/
909
909
        trx_t*  trx)    /*!< in, own: trx object */
910
910
 {
917
917
        mutex_enter(&kernel_mutex);
918
918
 
919
919
        trx_free(trx);
920
 
@@ -1093,6 +1119,9 @@
 
920
@@ -1157,6 +1183,9 @@
921
921
        trx_t*  trx)    /*!< in: transaction */
922
922
 {
923
923
        que_thr_t*      thr;
927
927
 
928
928
        ut_ad(mutex_own(&kernel_mutex));
929
929
        ut_ad(trx->que_state == TRX_QUE_LOCK_WAIT);
930
 
@@ -1107,6 +1136,11 @@
 
930
@@ -1171,6 +1200,11 @@
931
931
                thr = UT_LIST_GET_FIRST(trx->wait_thrs);
932
932
        }
933
933
 
939
939
        trx->que_state = TRX_QUE_RUNNING;
940
940
 }
941
941
 
942
 
@@ -1120,6 +1154,9 @@
 
942
@@ -1184,6 +1218,9 @@
943
943
        trx_t*  trx)    /*!< in: transaction in the TRX_QUE_LOCK_WAIT state */
944
944
 {
945
945
        que_thr_t*      thr;
949
949
 
950
950
        ut_ad(mutex_own(&kernel_mutex));
951
951
        ut_ad(trx->que_state == TRX_QUE_LOCK_WAIT);
952
 
@@ -1134,6 +1171,11 @@
 
952
@@ -1198,6 +1235,11 @@
953
953
                thr = UT_LIST_GET_FIRST(trx->wait_thrs);
954
954
        }
955
955