bzr push into mysql-trunk branch (magnus.blaudd:3912 to 3913)

[magnus.blaudd]

 3913 magnus.blaudd@stripped	2012-05-28 [merge]
      Merge

    modified:
      sql/opt_explain_traditional.cc
 3912 Georgi Kodinov	2012-05-28
      WL#5924 addendum #1 : fix a pb2 compile problem on bsd

    modified:
      sql/sql_acl.cc
=== modified file 'sql/opt_explain_traditional.cc'
--- a/sql/opt_explain_traditional.cc	2012-05-22 09:03:56 +0000
+++ b/sql/opt_explain_traditional.cc	2012-05-28 13:03:41 +0000
@@ -51,7 +51,7 @@ static const char *traditional_extra_tag
   "Using join buffer",                 // ET_USING_JOIN_BUFFER 
   "const row not found",               // ET_CONST_ROW_NOT_FOUND
   "unique row not found",              // ET_UNIQUE_ROW_NOT_FOUND
-  "Impossible ON condition"            // ET_IMPOSSIBLE_ON_CONDITION
+  "Impossible ON condition",           // ET_IMPOSSIBLE_ON_CONDITION
   ""                                   // ET_PUSHED_JOIN
 };
 

No bundle (reason: useless for push emails).