← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to storage/innobase/srv/srv0srv.c

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/srv/srv0srv.c
726
726
        ulint           slot_no;
727
727
        ulint           type;
728
728
 
729
 
#ifdef UNIV_SYNC_DEBUG
730
729
        ut_ad(mutex_own(&kernel_mutex));
731
 
#endif /* UNIV_SYNC_DEBUG */
732
730
 
733
731
        slot_no = thr_local_get_slot_no(os_thread_get_curr_id());
734
732
 
780
778
        ut_ad(type >= SRV_WORKER);
781
779
        ut_ad(type <= SRV_MASTER);
782
780
        ut_ad(n > 0);
783
 
#ifdef UNIV_SYNC_DEBUG
784
781
        ut_ad(mutex_own(&kernel_mutex));
785
 
#endif /* UNIV_SYNC_DEBUG */
786
782
 
787
783
        for (i = 0; i < OS_THREAD_MAX_N; i++) {
788
784
 
1305
1301
        srv_slot_t*     slot;
1306
1302
        ulint           i;
1307
1303
 
1308
 
#ifdef UNIV_SYNC_DEBUG
1309
1304
        ut_ad(mutex_own(&kernel_mutex));
1310
 
#endif /* UNIV_SYNC_DEBUG */
1311
1305
 
1312
1306
        i = 0;
1313
1307
        slot = srv_mysql_table + i;
1387
1381
        ulint           sec;
1388
1382
        ulint           ms;
1389
1383
 
1390
 
#ifdef UNIV_SYNC_DEBUG
1391
1384
        ut_ad(!mutex_own(&kernel_mutex));
1392
 
#endif /* UNIV_SYNC_DEBUG */
1393
1385
 
1394
1386
        trx = thr_get_trx(thr);
1395
1387
 
1535
1527
        srv_slot_t*     slot;
1536
1528
        ulint           i;
1537
1529
 
1538
 
#ifdef UNIV_SYNC_DEBUG
1539
1530
        ut_ad(mutex_own(&kernel_mutex));
1540
 
#endif /* UNIV_SYNC_DEBUG */
1541
1531
 
1542
1532
        for (i = 0; i < OS_THREAD_MAX_N; i++) {
1543
1533
 
1830
1820
        export_vars.innodb_row_lock_waits = srv_n_lock_wait_count;
1831
1821
        export_vars.innodb_row_lock_current_waits
1832
1822
                = srv_n_lock_wait_current_count;
1833
 
        export_vars.innodb_row_lock_time = srv_n_lock_wait_time / 10000;
 
1823
        export_vars.innodb_row_lock_time = srv_n_lock_wait_time / 1000;
1834
1824
        if (srv_n_lock_wait_count > 0) {
1835
1825
                export_vars.innodb_row_lock_time_avg = (ulint)
1836
 
                        (srv_n_lock_wait_time / 10000 / srv_n_lock_wait_count);
 
1826
                        (srv_n_lock_wait_time / 1000 / srv_n_lock_wait_count);
1837
1827
        } else {
1838
1828
                export_vars.innodb_row_lock_time_avg = 0;
1839
1829
        }
1840
1830
        export_vars.innodb_row_lock_time_max
1841
 
                = srv_n_lock_max_wait_time / 10000;
 
1831
                = srv_n_lock_max_wait_time / 1000;
1842
1832
        export_vars.innodb_rows_read = srv_n_rows_read;
1843
1833
        export_vars.innodb_rows_inserted = srv_n_rows_inserted;
1844
1834
        export_vars.innodb_rows_updated = srv_n_rows_updated;