[Resend] bzr commit into mysql-trunk branch (guilhem.bichot:3295)

[Guilhem Bichot]

[This commit e-mail is a repeat.]

#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800-new2/ based
on revid:guilhem.bichot@stripped

 3295 Guilhem Bichot	2011-04-14
      review comments.

    modified:
      sql/opt_trace.cc
      sql/opt_trace.h
=== modified file 'sql/opt_trace.cc'
--- a/sql/opt_trace.cc	2011-04-13 15:36:01 +0000
+++ b/sql/opt_trace.cc	2011-04-14 13:02:22 +0000
@@ -68,14 +68,14 @@ public:
      the trace buffer, updates current_struct.
      @param  key              key or NULL
      @param  ots              structure being created
-     @param  feature          optimizer feature to which the structure belongs
+     @param  wants_disable_I_S whether structure wants to disable I_S output
      @param  opening_bracket  opening bracket to use
      @retval false ok
      @retval true  error, Opt_trace_struct must set itself to dummy; trace
      may have been written to, will likely be invalid JSON.
   */
   bool open_struct(const char *key, Opt_trace_struct *ots,
-                   bool has_disabled_I_S, char opening_bracket);
+                   bool wants_disable_I_S, char opening_bracket);
   /**
      When closing an Opt_trace_struct:
      - adds the closing bracket and optionally the key to the trace buffer
@@ -524,12 +524,12 @@ void Opt_trace_stmt::set_query(const cha
 
 
 bool Opt_trace_stmt::open_struct(const char *key, Opt_trace_struct *ots,
-                                 bool has_disabled_I_S,
+                                 bool wants_disable_I_S,
                                  char opening_bracket)
 {
   if (support_I_S == YES_FOR_THIS)
   {
-    if (has_disabled_I_S)
+    if (wants_disable_I_S)
     {
 
       /*

=== modified file 'sql/opt_trace.h'
--- a/sql/opt_trace.h	2011-04-13 15:36:01 +0000
+++ b/sql/opt_trace.h	2011-04-14 13:02:22 +0000
@@ -1067,7 +1067,7 @@ private:
     the value of @@@@optimizer_trace_features.
   */
   bool has_disabled_I_S;
-  bool empty;                                   ///< @see is_empty()
+  bool empty;                                   ///< @see set_not_empty()
 };
 
 


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