bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3380 to 3381)

[Mayank Prasad]

 3381 Mayank Prasad	2011-09-09
      fix for crash on pb2

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
 3380 Mayank Prasad	2011-09-08
      fix for failing test cases on pb2

    modified:
      sql/sql_lex.cc
      storage/perfschema/pfs.cc
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-09-07 21:27:46 +0000
+++ b/storage/perfschema/pfs.cc	2011-09-09 10:42:34 +0000
@@ -4797,7 +4797,7 @@ static struct PSI_digest_locker* digest_
   /* 
     If current statement is not instrumented
   */
-  if(!flag_events_statements_current)
+  if( !(flag_thread_instrumentation && flag_events_statements_current) )
   {
     return NULL;
   }
@@ -4890,8 +4890,8 @@ static void digest_add_token_v1(PSI_dige
        TODO If I un comment following code, few test cases in performance
        schema starts crashing. Need to investigate this.
     */
-    //digest_storage->m_token_array[digest_storage->m_token_count]= token;
-    //digest_storage->m_token_count++;
+    digest_storage->m_token_array[digest_storage->m_token_count]= token;
+    digest_storage->m_token_count++;
   }
 }
 

=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2011-09-06 12:24:04 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2011-09-09 10:42:34 +0000
@@ -1304,7 +1304,7 @@ bool pfs_show_status(handlerton *hton, T
       size= statement_digest_max * sizeof(PFS_statements_digest_stat);
       total_memory+= size;
       break;    
-/*
+    /*
       This case must be last,
       for aggregation in total_memory.
     */

No bundle (reason: useless for push emails).