bzr push into mysql-trunk branch (guilhem.bichot:3275 to 3276)

[Guilhem Bichot]

 3276 Guilhem Bichot	2011-03-10
      error handler should meet only OOM errors

    modified:
      unittest/gunit/opt_trace-t.cc
 3275 Guilhem Bichot	2011-03-08
      - constructor of Opt_trace_struct is made "protected", because users have no
      reason to directly create objects of that type, should create
      only Opt_trace_object and Opt_trace_array.
      - test that when opt trace is enabled then disabled, after that we don't
      go into thd->opt_trace->start() (optimization).

    modified:
      mysql-test/r/optimizer_trace_debug.result
      mysql-test/t/optimizer_trace_debug.test
      sql/opt_trace.h
=== modified file 'unittest/gunit/opt_trace-t.cc'
--- a/unittest/gunit/opt_trace-t.cc	2011-03-02 09:30:17 +0000
+++ b/unittest/gunit/opt_trace-t.cc	2011-03-10 12:49:24 +0000
@@ -91,6 +91,7 @@ protected:
   static bool oom; ///< whether we got an OOM error from opt trace
   static void my_error_handler(uint error, const char *str, myf MyFlags)
   {
+    EXPECT_EQ(EE_OUTOFMEMORY, error);
     if (error == EE_OUTOFMEMORY)
       oom= true;
   }

No bundle (reason: useless for push emails).