diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
| commit | 1d0f70c2f894b27e98773a282871d32802f67964 (patch) | |
| tree | 833e683e0ced29c4323c29a9d845703d4dfcd81b /storage/perfschema/unittest/pfs_timer-t.cc | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| download | mariadb-git-1d0f70c2f894b27e98773a282871d32802f67964.tar.gz | |
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
Diffstat (limited to 'storage/perfschema/unittest/pfs_timer-t.cc')
| -rw-r--r-- | storage/perfschema/unittest/pfs_timer-t.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/perfschema/unittest/pfs_timer-t.cc b/storage/perfschema/unittest/pfs_timer-t.cc index 9a1c743f642..9c9ae0f75f1 100644 --- a/storage/perfschema/unittest/pfs_timer-t.cc +++ b/storage/perfschema/unittest/pfs_timer-t.cc @@ -34,26 +34,26 @@ void test_timers() init_timers(); - t1_a= get_timer_value(TIMER_NAME_CYCLE); + t1_a= get_timer_pico_value(TIMER_NAME_CYCLE); /* Wait 5 seconds */ my_sleep(5000000); - t1_b= get_timer_value(TIMER_NAME_CYCLE); + t1_b= get_timer_pico_value(TIMER_NAME_CYCLE); - t2_a= get_timer_value(TIMER_NAME_NANOSEC); + t2_a= get_timer_pico_value(TIMER_NAME_NANOSEC); my_sleep(5000000); - t2_b= get_timer_value(TIMER_NAME_NANOSEC); + t2_b= get_timer_pico_value(TIMER_NAME_NANOSEC); - t3_a= get_timer_value(TIMER_NAME_MICROSEC); + t3_a= get_timer_pico_value(TIMER_NAME_MICROSEC); my_sleep(5000000); - t3_b= get_timer_value(TIMER_NAME_MICROSEC); + t3_b= get_timer_pico_value(TIMER_NAME_MICROSEC); - t4_a= get_timer_value(TIMER_NAME_MILLISEC); + t4_a= get_timer_pico_value(TIMER_NAME_MILLISEC); my_sleep(5000000); - t4_b= get_timer_value(TIMER_NAME_MILLISEC); + t4_b= get_timer_pico_value(TIMER_NAME_MILLISEC); - t5_a= get_timer_value(TIMER_NAME_TICK); + t5_a= get_timer_pico_value(TIMER_NAME_TICK); my_sleep(5000000); - t5_b= get_timer_value(TIMER_NAME_TICK); + t5_b= get_timer_pico_value(TIMER_NAME_TICK); /* Print the timer values, for manual inspection by a human. |