Bug #26597243: AMBIGUOUS INCLUDE PATHS [noclose, angle brackets]

Clean up all #includes of files from include/ so that they use quotes
instead of angle brackets, with the notable exception of include/mysql/,
since some of those are used from client headers (where they are reasonably
system headers). Then resort headers in all affected files.

As before, InnoDB is left alone.

Change-Id: Ibd1874aed443c34899553d7c895c8484eca171af

Author: Steinar H. Gunderson

client/base/abstract_value_option.h

@@ -18,10 +18,10 @@
 #ifndef ABSTRACT_VALUE_OPTION_INCLUDED
 #define ABSTRACT_VALUE_OPTION_INCLUDED
 
-#include <my_getopt.h>
 #include <string>
 
 #include "client/base/abstract_option.h"
+#include "my_getopt.h"
 
 namespace Mysql{
 namespace Tools{

client/base/bool_option.h

@@ -18,10 +18,10 @@
 #ifndef BOOL_OPTION_INCLUDED
 #define BOOL_OPTION_INCLUDED
 
-#include <my_getopt.h>
 #include <string>
 
 #include "client/base/abstract_option.h"
+#include "my_getopt.h"
 
 namespace Mysql{
 namespace Tools{

client/base/disabled_option.h

@@ -18,9 +18,8 @@
 #ifndef DISABLED_OPTION_INCLUDED
 #define DISABLED_OPTION_INCLUDED
 
-#include <my_getopt.h>
-
 #include "client/base/abstract_option.h"
+#include "my_getopt.h"
 
 namespace Mysql{
 namespace Tools{

client/base/help_options.cc

@@ -18,14 +18,14 @@
 #include "client/base/help_options.h"
 
 #include <stdlib.h>
-#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 #include <functional>
 #include <sstream>
 
 #include "client/base/abstract_program.h"
 #include "client/client_priv.h"
 #include "my_default.h"
 #include "print_version.h"
+#include "welcome_copyright_notice.h" /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 using namespace Mysql::Tools::Base::Options;
 using std::placeholders::_1;

client/base/i_options_provider.h

@@ -18,10 +18,10 @@
 #ifndef I_OPTIONS_PROVIDER_INCLUDED
 #define I_OPTIONS_PROVIDER_INCLUDED
 
-#include <my_getopt.h>
 #include <vector>
 
 #include "client/base/i_option_changed_listener.h"
+#include "my_getopt.h"
 
 namespace Mysql{
 namespace Tools{

client/base/mysql_connection_options.cc

@@ -17,7 +17,6 @@
 
 #include "client/base/mysql_connection_options.h"
 
-#include <mysys_err.h>
 #include <stdlib.h>
 #include <functional>
 #include <sstream>

client/base/password_option.h

@@ -18,10 +18,10 @@
 #ifndef PASSWORD_OPTION_INCLUDED
 #define PASSWORD_OPTION_INCLUDED
 
-#include <my_getopt.h>
 #include <string>
 
 #include "client/base/abstract_string_option.h"
+#include "my_getopt.h"
 #include "nullable.h"
 
 namespace Mysql{

client/base/simple_option.h

@@ -18,10 +18,10 @@
 #ifndef SIMPLE_OPTION_INCLUDED
 #define SIMPLE_OPTION_INCLUDED
 
-#include <my_getopt.h>
 #include <string>
 
 #include "client/base/abstract_option.h"
+#include "my_getopt.h"
 
 namespace Mysql{
 namespace Tools{

client/base/string_option.h

@@ -18,10 +18,10 @@
 #ifndef STRING_OPTION_INCLUDED
 #define STRING_OPTION_INCLUDED
 
-#include <my_getopt.h>
 #include <string>
 
 #include "client/base/abstract_string_option.h"
+#include "my_getopt.h"
 #include "nullable.h"
 
 namespace Mysql{

client/check/mysqlcheck.cc

@@ -17,22 +17,22 @@
 
 #include "client/check/mysqlcheck.h"
 
-#include <caching_sha2_passwordopt-vars.h>
-#include <m_ctype.h>
 #include <mysql_version.h>
 #include <mysqld_error.h>
-#include <sslopt-vars.h>
 #include <stdlib.h>
-#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
+#include "caching_sha2_passwordopt-vars.h"
 #include "client/client_priv.h"
+#include "m_ctype.h"
 #include "my_dbug.h"
 #include "my_default.h"
 #include "my_inttypes.h"
 #include "my_macros.h"
 #include "mysql/service_mysql_alloc.h"
 #include "print_version.h"
+#include "sslopt-vars.h"
 #include "typelib.h"
+#include "welcome_copyright_notice.h" /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 using namespace Mysql::Tools::Check;
 using std::string;
@@ -196,8 +196,8 @@ static struct my_option my_long_options[] =
   {"socket", 'S', "The socket file to use for connection.",
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#include <caching_sha2_passwordopt-longopts.h>
-#include <sslopt-longopts.h>
+#include "caching_sha2_passwordopt-longopts.h"
+#include "sslopt-longopts.h"
 
   {"tables", OPT_TABLES, "Overrides option --databases (-B).", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -314,7 +314,7 @@ get_one_option(int optid, const struct my_option *opt,
     DBUG_PUSH(argument ? argument : "d:t:o");
     debug_check_flag= 1;
     break;
-#include <sslopt-case.h>
+#include "sslopt-case.h"
 
   case OPT_TABLES:
     opt_databases = 0;