From: Jorgen Loland
Date: January 3 2011 1:10pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3245) WL#4800
List-Archive: http://lists.mysql.com/commits/127785
Message-Id: <20110103131007.36510B59@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6292457479753467981=="

--===============6292457479753467981==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/jl208045/mysql/wl4800/mysql-next-mr-opt-backporting-wl4800-revert_printquick/ based on revid:jorgen.loland@stripped

 3245 Jorgen Loland	2011-01-03
      WL#4800: Remove opt_trace.h from includes in opt_range.h

    modified:
      sql/opt_range.h
      sql/sql_delete.cc
      sql/sql_help.cc
      sql/sql_prepare.cc
      sql/sql_update.cc
=== modified file 'sql/opt_range.h'
--- a/sql/opt_range.h	2011-01-03 11:14:55 +0000
+++ b/sql/opt_range.h	2011-01-03 13:10:02 +0000
@@ -33,7 +33,6 @@
 */
 #include "sql_class.h"                          // set_var.h: THD
 #include "set_var.h"                            /* Item */
-#include "opt_trace.h"
 
 class JOIN;
 class Item_sum;

=== modified file 'sql/sql_delete.cc'
--- a/sql/sql_delete.cc	2010-11-24 18:54:26 +0000
+++ b/sql/sql_delete.cc	2011-01-03 13:10:02 +0000
@@ -35,6 +35,7 @@
 #include "sp_head.h"
 #include "sql_trigger.h"
 #include "transaction.h"
+#include "opt_trace.h"                          // Opt_trace_object
 #include "records.h"                            // init_read_record,
                                                 // end_read_record
 

=== modified file 'sql/sql_help.cc'
--- a/sql/sql_help.cc	2010-11-17 12:27:39 +0000
+++ b/sql/sql_help.cc	2011-01-03 13:10:02 +0000
@@ -19,6 +19,7 @@
 #include "sql_table.h"                          // primary_key_name
 #include "sql_base.h"               // REPORT_ALL_ERRORS, setup_tables
 #include "opt_range.h"              // SQL_SELECT
+#include "opt_trace.h"              // Opt_trace_object
 #include "records.h"          // init_read_record, end_read_record
 
 struct st_find_field

=== modified file 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	2010-12-19 14:24:03 +0000
+++ b/sql/sql_prepare.cc	2011-01-03 13:10:02 +0000
@@ -113,6 +113,7 @@ When one supplies long data for a placeh
 #include <mysql_com.h>
 #endif
 #include "lock.h"                               // MYSQL_OPEN_FORCE_SHARED_MDL
+#include "opt_trace.h"                          // Opt_trace_object
 
 /**
   A result class used to send cursor rows using the binary protocol.

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-11-24 18:54:26 +0000
+++ b/sql/sql_update.cc	2011-01-03 13:10:02 +0000
@@ -42,6 +42,7 @@
                          // mysql_handle_derived,
                          // mysql_derived_filling
 
+#include "opt_trace.h"   // Opt_trace_object
 /* Return 0 if row hasn't changed */
 
 bool compare_record(TABLE *table)


--===============6292457479753467981==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jorgen.loland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   fa9gnd9109vw3mxj
# target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\
#   mr-opt-backporting-wl4800-revert_printquick/
# testament_sha1: fbc86db3a5ef786393fe48714f279649b7653c10
# timestamp: 2011-01-03 14:10:07 +0100
# base_revision_id: jorgen.loland@stripped\
#   qnyy790qpfm7wtxh
# 
# Begin bundle
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


--===============6292457479753467981==--