bzr commit into mysql-trunk branch (tor.didriksen:3297)

[Tor Didriksen]

#At file:///export/home/didrik/repo/next-mr-opt-backporting-wl4800/ based on revid:guilhem.bichot@stripped

 3297 Tor Didriksen	2011-05-05
      Workaround for gcc bug 29365

    modified:
      sql/opt_trace.cc
=== modified file 'sql/opt_trace.cc'
--- a/sql/opt_trace.cc	2011-05-04 20:53:28 +0000
+++ b/sql/opt_trace.cc	2011-05-05 10:44:37 +0000
@@ -26,7 +26,8 @@
 
 #ifdef OPTIMIZER_TRACE
 
-namespace {
+// gcc.gnu.org/bugzilla/show_bug.cgi?id=29365
+namespace random_name_to_avoid_gcc_bug_29365 {
 /**
   A wrapper of class String, for storing query or trace.
   Any memory allocation error in this class is reported by my_error(), see
@@ -76,6 +77,10 @@ public:
 
 } // namespace
 
+
+using random_name_to_avoid_gcc_bug_29365::Buffer;
+
+
 /**
   @class Opt_trace_stmt
 
@@ -728,7 +733,7 @@ void Opt_trace_stmt::missing_privilege()
 
 // Implementation of class Buffer
 
-namespace {
+namespace random_name_to_avoid_gcc_bug_29365 {
 
 void Buffer::append_escaped(const char *str, size_t length)
 {


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