bzr push into mysql-trunk branch (guilhem.bichot:3797 to 3798) Bug#13860138

[Guilhem Bichot]

 3798 Guilhem Bichot	2012-03-19
      fix for Bug#13860138 BUILD BREAK WHEN COMPILING WITHOUT OPT_TRACE

    modified:
      sql/opt_range.cc
      sql/opt_trace_context.h
 3797 Marc Alff	2012-03-19
      WL#5767 PERFORMANCE SCHEMA DIGEST
      
      Post merge cleanup (3)

    removed:
      mysql-test/suite/sys_vars/r/pfs_digests_size.result
      mysql-test/suite/sys_vars/t/pfs_digests_size-master_basic.opt
    added:
      mysql-test/suite/sys_vars/r/pfs_digests_size_basic.result
      mysql-test/suite/sys_vars/t/pfs_digests_size_basic-master.opt
    modified:
      .bzrignore
      sql/sys_vars.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2012-03-14 13:10:55 +0000
+++ b/sql/opt_range.cc	2012-03-19 12:44:38 +0000
@@ -884,11 +884,11 @@ static void trace_range_all_keyparts(Opt
                                      const String *range_so_far,
                                      SEL_ARG *keypart_root,
                                      const KEY_PART_INFO *key_parts);
-static void append_range(String *out,
-                         const KEY_PART_INFO *key_parts,
-                         const uchar *min_key, const uchar *max_key,
-                         const uint flag);
 #endif
+void append_range(String *out,
+                  const KEY_PART_INFO *key_parts,
+                  const uchar *min_key, const uchar *max_key,
+                  const uint flag);
 
 static SEL_TREE *tree_and(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2);
 static SEL_TREE *tree_or(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2);
@@ -13067,8 +13067,6 @@ static void print_ror_scans_arr(TABLE *t
 
 #endif /* !DBUG_OFF */
 
-#ifdef OPTIMIZER_TRACE
-
 /**
   Print a key to a string
 
@@ -13127,10 +13125,10 @@ restore_col_map:
   @param[in]     flag         Key range flags defining what min_key
                               and max_key represent @see my_base.h
  */
-static void append_range(String *out,
-                         const KEY_PART_INFO *key_part,
-                         const uchar *min_key, const uchar *max_key,
-                         const uint flag)
+void append_range(String *out,
+                  const KEY_PART_INFO *key_part,
+                  const uchar *min_key, const uchar *max_key,
+                  const uint flag)
 {
   if (out->length() > 0)
     out->append(STRING_WITH_LEN(" AND "));
@@ -13156,6 +13154,9 @@ static void append_range(String *out,
   }
 }
 
+
+#ifdef OPTIMIZER_TRACE
+
 /**
   Traverse an R-B tree of range conditions and append all ranges for this
   keypart and consecutive keyparts to the optimizer trace. See

=== modified file 'sql/opt_trace_context.h'
--- a/sql/opt_trace_context.h	2012-02-29 11:17:52 +0000
+++ b/sql/opt_trace_context.h	2012-03-19 12:44:38 +0000
@@ -425,6 +425,15 @@ public:
     FLAG_ONE_LINE=   1 << 1
   };
   static bool is_started() { return false; }
+  bool start(bool support_I_S,
+             bool support_dbug_or_missing_priv,
+             bool end_marker, bool one_line,
+             long offset, long limit, ulong max_mem_size,
+             ulonglong features)
+  { return false; }
+  const char *get_tail(size_t size)
+  { return ""; }
+  void end() {}
 };
 
 #endif /* OPTIMIZER_TRACE */

No bundle (reason: useless for push emails).