Bug#24488219: INCLUDE WHAT YOU USE

Make only one canonical place to get LEX_STRING from. We had this typedef
repeated a number of times throughout the code base, which would cause
IWYU to pick a random one and include e.g. sql_class.h into client code.

Change-Id: I5fb63ff4d02c3ae3c1913957bf70df287f9f2289

Author: Steinar H. Gunderson

client/mysql.cc

@@ -46,6 +46,7 @@
 #include <violite.h>
 
 #include "client_priv.h"
+#include "lex_string.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_default.h"

include/lex_string.h

@@ -0,0 +1,31 @@
+/*
+   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef LEX_STRING_INCLUDED
+#define LEX_STRING_INCLUDED
+
+#include "mysql/mysql_lex_string.h"
+
+/*
+  LEX_STRING -- a pair of a C-string and its length.
+  (it's part of the plugin API as a MYSQL_LEX_STRING)
+  Ditto LEX_CSTRING/MYSQL_LEX_CSTRING.
+*/
+
+typedef struct st_mysql_lex_string LEX_STRING;
+typedef struct st_mysql_const_lex_string LEX_CSTRING;
+
+#endif

include/m_string.h

@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "lex_string.h"
 #include "my_byteorder.h"    /* uint8korr */
 #include "my_config.h"
 #include "my_dbug.h"
@@ -336,20 +337,10 @@ static inline char *ullstr(longlong value, char *buff)
 }
 #endif
 
-/*
-  LEX_STRING -- a pair of a C-string and its length.
-  (it's part of the plugin API as a MYSQL_LEX_STRING)
-  Ditto LEX_CSTRING/MYSQL_LEX_CSTRING.
-*/
-
-typedef struct st_mysql_lex_string LEX_STRING;
-typedef struct st_mysql_const_lex_string LEX_CSTRING;
-
 #define STRING_WITH_LEN(X) (X), ((sizeof(X) - 1))
 #define USTRING_WITH_LEN(X) ((uchar*) X), ((sizeof(X) - 1))
 #define C_STRING_WITH_LEN(X) ((char *) (X)), ((sizeof(X) - 1))
 
-
 /**
   Skip trailing space.
 

include/sql_string.h

@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <new>
 
+#include "lex_string.h"
 #include "m_ctype.h"                         // my_convert
 #include "m_string.h"                        // LEX_CSTRING
 #include "mem_root_fwd.h"
@@ -39,9 +40,6 @@
 #include "mysql/psi/psi_memory.h"
 #include "mysql/service_mysql_alloc.h"       // my_free
 
-typedef struct st_mysql_lex_string LEX_STRING;
-
-
 #ifdef MYSQL_SERVER
 extern "C" {
 extern PSI_memory_key key_memory_String_value;

plugin/audit_null/audit_null.c

@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include "lex_string.h"
 #include "my_compiler.h"
 #include "my_inttypes.h"
 #include "my_macros.h"

plugin/version_token/version_token.cc

@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <sstream>
 
+#include "lex_string.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"

rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc

@@ -17,6 +17,7 @@
 
 #include <stddef.h>
 
+#include "lex_string.h"
 #include "my_dbug.h"
 #include "plugin_log.h"
 

sql-common/client.cc

@@ -47,6 +47,7 @@
 
 #include "errmsg.h"
 #include "hash.h"
+#include "lex_string.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_default.h"

sql/auth/auth_common.h

@@ -25,6 +25,7 @@
 #include <vector>
 
 #include "auth_acls.h"                          /* ACL information */
+#include "lex_string.h"
 #include "m_string.h"
 #include "my_command.h"
 #include "my_dbug.h"

sql/auth/role_tables.cc

@@ -22,6 +22,7 @@
 #include "field.h"
 #include "handler.h"
 #include "key.h"
+#include "lex_string.h"
 #include "m_string.h"
 #include "mdl.h"
 #include "my_base.h"