bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3245) WL#4800

[Jorgen Loland]

#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)


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