bzr push into mysql-trunk branch (tor.didriksen:3425 to 3426) WL#4897

[Tor Didriksen]

 3426 Tor Didriksen	2011-09-22
      WL#4897: Add EXPLAIN INSERT/UPDATE/DELETE
      
      Post-push fix, there was a memory leak in mysqltest,
      since 'explain_re' is now a separate struct.

    modified:
      client/mysqltest.cc
 3425 Sunny Bains	2011-09-22
      Bug# 13011596 - THE STATS COUNTING IS EXPENSIVE DUE TO THE MUTEX WHEN DOING IO
      
      The mutex calls that protect the IO counters are expensive. This is with a load
      with checksums=off. Otherwise the checksum code dominates. 
            
      Make the monitor inc/dec atomic. The accuracy of the min and max values is not
      100% due to an inherent race. To use atomics add another condition that
      UNIV_WORD_SIZE == 8 because the monitor counters use ib_int64_t. 
            
      Approved by Jimmy rb://751

    modified:
      storage/innobase/include/srv0mon.h
      storage/innobase/os/os0file.c
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-08-22 13:24:38 +0000
+++ b/client/mysqltest.cc	2011-09-22 08:26:08 +0000
@@ -8076,6 +8076,7 @@ void free_re(void)
   my_regfree(&sp_re);
   my_regfree(&view_re);
   my_regfree(&opt_trace_re);
+  my_regfree(&explain_re);
   my_regex_end();
 }
 

No bundle (reason: useless for push emails).