Bug #26597243: AMBIGUOUS INCLUDE PATHS

Canonicalize all paths leading into sql/, then resort #include statements
in the affected files. Finally take sql/ out of the include path.

InnoDB has been left alone, except where InnoDB #includes were used from
non-InnoDB sources.

Change-Id: I2b4745f656db3eefa35d9053361d21a4658dc112

Author: Steinar H. Gunderson

CMakeLists.txt

@@ -644,7 +644,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/extra/regex
   ${CMAKE_SOURCE_DIR}/extra/rapidjson/include
-  ${CMAKE_SOURCE_DIR}/sql/histograms
   ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/include
   ${CMAKE_SOURCE_DIR}/libbinlogevents/export)
 # Add bundled or system zlib.

client/dump/object_filter.cc

@@ -18,14 +18,14 @@
 #ifndef UNITTEST_OBJECT_FILTER_PARSER
 #include "object_filter.h"
 
+#include "client/dump/table.h"
+#include "client/dump/trigger.h"
 #include "database.h"
 #include "event_scheduler_event.h"
 #include "mysql_function.h"
 #include "pattern_matcher.h"
 #include "privilege.h"
 #include "stored_procedure.h"
-#include "table.h"
-#include "trigger.h"
 #endif
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>

client/dump/table.h

@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "abstract_plain_sql_object.h"
-#include "field.h"
+#include "client/dump/field.h"
 #include "my_inttypes.h"
 
 namespace Mysql{

client/dump/trigger.h

@@ -19,8 +19,8 @@
 #define TRIGGER_INCLUDED
 
 #include "abstract_plain_sql_object_dump_task.h"
+#include "client/dump/table.h"
 #include "my_inttypes.h"
-#include "table.h"
 
 namespace Mysql{
 namespace Tools{

client/mysql.cc

@@ -90,10 +90,11 @@
 #endif
 
 #include <mysqld_error.h>
-#include <sql_common.h>
 #include <algorithm>
 #include <new>
 
+#include "sql_common.h"
+
 using std::min;
 using std::max;
 

client/mysqladmin.cc

@@ -22,7 +22,6 @@
 #include <mysql.h>
 #include <mysqld_error.h>                       /* to check server error codes */
 #include <signal.h>
-#include <sql_common.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -39,6 +38,7 @@
 #include "my_macros.h"
 #include "mysql/service_mysql_alloc.h"
 #include "print_version.h"
+#include "sql_common.h"
 #include "typelib.h"
 
 #define MAX_MYSQL_VAR 512

client/mysqlbinlog.cc

@@ -40,9 +40,7 @@
 #include <utility>
 
 #include "client_priv.h"
-#include "log_event.h"
 #include "my_dbug.h"
-#include "my_decimal.h"
 #include "my_default.h"
 #include "my_dir.h"
 #include "my_io.h"
@@ -51,8 +49,10 @@
 #include "mysql/service_my_snprintf.h"
 #include "prealloced_array.h"
 #include "print_version.h"
-#include "rpl_constants.h"
-#include "rpl_gtid.h"
+#include "sql/log_event.h"
+#include "sql/my_decimal.h"
+#include "sql/rpl_constants.h"
+#include "sql/rpl_gtid.h"
 #include "sql_common.h"
 #include "sql_string.h"
 #include "sslopt-vars.h"

client/mysqltest.cc

@@ -38,7 +38,6 @@
 #include <my_dir.h>
 #include <mysql_version.h>
 #include <mysqld_error.h>
-#include <sql_common.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -57,6 +56,7 @@
 #include "my_regex.h" /* Our own version of regex */
 #include "my_thread_local.h"
 #include "mysql/service_my_snprintf.h"
+#include "sql_common.h"
 #include "typelib.h"
 #ifndef _WIN32
 #include <sys/wait.h>

components/mysql_server/dynamic_loader_path_filter.cc

@@ -20,11 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 #include <mysql_com.h> // NAME_CHAR_LEN
 #include <string>
 
-#include "../../../sql/sql_plugin.h" // opt_plugin_dir
 #include "dynamic_loader_scheme_file.h"
 #include "my_io.h"
 #include "my_sharedlib.h"
 #include "server_component.h"
+#include "sql/sql_plugin.h" // opt_plugin_dir
 
 typedef std::string my_string;
 

components/mysql_server/dynamic_loader_path_filter.h

@@ -17,10 +17,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 #define MYSQL_SERVER_DYNAMIC_LOADER_PATH_FILTER_H
 
 #include <mysql/components/service_implementation.h>
-#include "../../../sql/sql_plugin.h" // opt_plugin_dir
-#include "server_component.h"
 #include <string>
 
+#include "server_component.h"
+#include "sql/sql_plugin.h" // opt_plugin_dir
+
 /**
   Checks if path specified to load is contained in plug-in directory and
   change it to absolute one using plug-in directory. Calls wrapped file scheme