bzr push into mysql-trunk-perfschema branch (marc.alff:2949 to 2950) Bug#48631

[Marc Alff]

 2950 Marc Alff	2009-11-09
      Bug#48631 Performance schema: unit test failures
      
      Cleanup of the timer unit test.
      Avoid including the overhead of timer X in the measure of timer Y.

    modified:
      storage/perfschema/unittest/pfs_timer-t.cc
 2949 Marc Alff	2009-11-06
      Restored original asserts on thd->lex_is_lex_started,
      and implemented a work around instead.

    modified:
      sql/sql_base.cc
      sql/table.cc
      storage/perfschema/pfs_engine_table.cc
=== modified file 'storage/perfschema/unittest/pfs_timer-t.cc'
--- a/storage/perfschema/unittest/pfs_timer-t.cc	2009-11-04 03:11:29 +0000
+++ b/storage/perfschema/unittest/pfs_timer-t.cc	2009-11-09 22:06:45 +0000
@@ -35,18 +35,24 @@ void test_timers()
   init_timers();
 
   t1_a= get_timer_value(TIMER_NAME_CYCLE);
-  t2_a= get_timer_value(TIMER_NAME_NANOSEC);
-  t3_a= get_timer_value(TIMER_NAME_MICROSEC);
-  t4_a= get_timer_value(TIMER_NAME_MILLISEC);
-  t5_a= get_timer_value(TIMER_NAME_TICK);
-
   /* Wait 5 seconds */
   my_sleep(5000000);
-
   t1_b= get_timer_value(TIMER_NAME_CYCLE);
+
+  t2_a= get_timer_value(TIMER_NAME_NANOSEC);
+  my_sleep(5000000);
   t2_b= get_timer_value(TIMER_NAME_NANOSEC);
+
+  t3_a= get_timer_value(TIMER_NAME_MICROSEC);
+  my_sleep(5000000);
   t3_b= get_timer_value(TIMER_NAME_MICROSEC);
+
+  t4_a= get_timer_value(TIMER_NAME_MILLISEC);
+  my_sleep(5000000);
   t4_b= get_timer_value(TIMER_NAME_MILLISEC);
+
+  t5_a= get_timer_value(TIMER_NAME_TICK);
+  my_sleep(5000000);
   t5_b= get_timer_value(TIMER_NAME_TICK);
 
   /* Checking we are within a 1/1000 range */


Attachment: [text/bzr-bundle] bzr/[e-mail]