← Back to branch summary

~percona-dev/percona-server/5.1-innodb_extend_slow-overflows_fix

« back to all changes in this revision

Viewing changes to innodb_extend_slow.patch

  • Committer: Oleg Tsarev
  • Date: 2011-03-24 15:22:51 UTC
  • Revision ID: oleg.tsarev@percona.com-20110324152251-7cgg9x6omgcv3qg1
fix overflows in innodb_extend_slow.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_extend_slow.patch
99
99
+               {
100
100
+                       ut_usectime(&sec, &ms);
101
101
+                       finish_time = (ib_uint64_t)sec * 1000000 + ms;
102
 
+                       trx->io_reads_wait_timer += (ulint)(finish_time - start_time);
 
102
+                       trx->io_reads_wait_timer += (ulint)((finish_time < start_time ? 0 : finish_time - start_time);
103
103
+               }
104
104
        }
105
105
 
157
157
+                       {
158
158
+                               ut_usectime(&sec, &ms);
159
159
+                               finish_time = (ib_uint64_t)sec * 1000000 + ms;
160
 
+                               trx->io_reads_wait_timer += (ulint)(finish_time - start_time);
 
160
+                               trx->io_reads_wait_timer += (ulint)(finish_time < start_time ? 0 : finish_time - start_time);
161
161
+                       }
162
162
                }
163
163
 
718
718
+       {
719
719
+               ut_usectime(&sec, &ms);
720
720
+               finish_time = (ib_uint64_t)sec * 1000000 + ms;
721
 
+               trx->io_reads_wait_timer += (ulint)(finish_time - start_time);
 
721
+               trx->io_reads_wait_timer += (ulint)(finish_time < start_time ? 0 : finish_time - start_time);
722
722
+       }
723
723
+
724
724
        return(n_bytes);
732
732
+               {
733
733
+                       ut_usectime(&sec, &ms);
734
734
+                       finish_time = (ib_uint64_t)sec * 1000000 + ms;
735
 
+                       trx->io_reads_wait_timer += (ulint)(finish_time - start_time);
 
735
+                       trx->io_reads_wait_timer += (ulint)(finish_time < start_time ? 0 : finish_time - start_time);
736
736
+               }
737
737
+
738
738
                return(ret);
854
854
+       if (innobase_get_slow_log() && trx->take_stats && start_time) {
855
855
+               ut_usectime(&sec, &ms);
856
856
+               finish_time = (ib_uint64_t)sec * 1000000 + ms;
857
 
+               trx->innodb_que_wait_timer += (ulint)(finish_time - start_time);
 
857
+               trx->innodb_que_wait_timer += (ulint)(finish_time < start_time ? 0 : finish_time - start_time);
858
858
+       }
859
859
+
860
860
        os_fast_mutex_lock(&srv_conc_mutex);
934
934
+       if (innobase_get_slow_log() && trx->take_stats) {
935
935
+               ut_usectime(&sec, &ms);
936
936
+               now = (ib_uint64_t)sec * 1000000 + ms;
937
 
+               trx->lock_que_wait_timer += (ulint)(now - trx->lock_que_wait_ustarted);
 
937
+               trx->lock_que_wait_timer += (ulint)(now < trx->lock_que_wait_ustarted? 0 : now - trx->lock_que_wait_ustarted);
938
938
+       }
939
939
        trx->que_state = TRX_QUE_RUNNING;
940
940
 }
956
956
+       if (innobase_get_slow_log() && trx->take_stats) {
957
957
+               ut_usectime(&sec, &ms);
958
958
+               now = (ib_uint64_t)sec * 1000000 + ms;
959
 
+               trx->lock_que_wait_timer += (ulint)(now - trx->lock_que_wait_ustarted);
 
959
+               trx->lock_que_wait_timer += (ulint)(now < trx->lock_que_wait_ustarted ? 0 : now - trx->lock_que_wait_ustarted);
960
960
+       }
961
961
        trx->que_state = TRX_QUE_RUNNING;
962
962
 }