List:Commits« Previous MessageNext Message »
From:Guilhem Bichot Date:May 6 2011 12:02pm
Subject:bzr commit into mysql-trunk branch (guilhem.bichot:3300)
View as plain text  
#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800/ based on revid:guilhem.bichot@stripped

 3300 Guilhem Bichot	2011-05-06
      fix for solaris compiler errors:
      - WEXITSTATUS was not declared
      - some local variable hid some class member

    modified:
      unittest/gunit/opt_trace-t.cc
=== modified file 'unittest/gunit/opt_trace-t.cc'
--- a/unittest/gunit/opt_trace-t.cc	2011-05-04 20:53:28 +0000
+++ b/unittest/gunit/opt_trace-t.cc	2011-05-06 12:02:15 +0000
@@ -21,10 +21,13 @@
 #include "my_config.h"
 #include <gtest/gtest.h>
 
+#ifdef OPTIMIZER_TRACE
+
 #include <opt_trace.h>
 #include <mysys_err.h>                          // for testing of OOM
-
-#ifdef OPTIMIZER_TRACE
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>                           // for WEXITSTATUS
+#endif
 
 CHARSET_INFO *system_charset_info= &my_charset_utf8_general_ci;
 
@@ -648,7 +651,6 @@ TEST_F(TraceContentTest, MaxMemSize)
 /** Test how truncation by max_mem_size affects next traces */
 TEST_F(TraceContentTest, MaxMemSize2)
 {
-  Opt_trace_context trace;
   ASSERT_EQ(false, trace.start(true, false, false, false, -2,
                                2, 21 /* max_mem_size */, all_features));
   /* make a "long" trace */
@@ -797,7 +799,6 @@ TEST_F(TraceContentTest, OOMinBookKeepin
 /// Test reaction to OOM when purging traces
 TEST_F(TraceContentTest, OOMinPurge)
 {
-  Opt_trace_context trace;
   make_one_trace(&trace, "103", -3, 2);
   make_one_trace(&trace, "104", -3, 2);
   DBUG_SET("+d,opt_trace_oom_in_purge");


Attachment: [text/bzr-bundle] bzr/guilhem.bichot@oracle.com-20110506120215-2mxarhqj03nu1s7x.bundle
Thread
bzr commit into mysql-trunk branch (guilhem.bichot:3300) Guilhem Bichot6 May