Bug#20308296 CLEANUP #INCLUDE OF PLUGIN CODE IN M_STRING.H

In m_string.h we currently do #include of plugin.h
This effectively makes *all* other code dependent on plugin declarations.

Fix:
In m_string: only include the declaration of st_mysql_lex_string,
and my_snprintf/my_vsnprintf

Author: Tor Didriksen

include/m_string.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -27,6 +27,8 @@
 #define strmov please_use_my_stpcpy_or_my_stpmov_rather_than_strmov
 #define strnmov please_use_my_stpncpy_or_my_stpnmov_rather_than_strnmov
 
+#include "mysql/service_my_snprintf.h"
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -228,7 +230,7 @@ extern char *longlong10_to_str(longlong val,char *dst,int radix);
   (it's part of the plugin API as a MYSQL_LEX_STRING)
 */
 
-#include <mysql/plugin.h>
+#include <mysql/mysql_lex_string.h>
 typedef struct st_mysql_lex_string LEX_STRING;
 
 #define STRING_WITH_LEN(X) (X), ((size_t) (sizeof(X) - 1))

include/myisam.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -23,7 +23,6 @@
 #include "m_ctype.h"
 #include "keycache.h"
 #include "my_compare.h"
-#include "mysql/plugin.h"
 #include "my_check_opt.h"
 #include "m_string.h"
 

include/mysql/mysql_lex_string.h

@@ -0,0 +1,26 @@
+/* Copyright (c) 2015, 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 MYSQL_LEX_STRING_INCLUDED
+#define MYSQL_LEX_STRING_INCLUDED
+
+struct st_mysql_lex_string
+{
+  char *str;
+  size_t length;
+};
+typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
+
+#endif  // MYSQL_LEX_STRING_INCLUDED

include/mysql/plugin_audit.h.pp

@@ -9,6 +9,7 @@
 size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
 size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
 #include <mysql/service_thd_alloc.h>
+#include <mysql/mysql_lex_string.h>
 struct st_mysql_lex_string
 {
   char *str;

include/mysql/plugin_auth.h.pp

@@ -9,6 +9,7 @@
 size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
 size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
 #include <mysql/service_thd_alloc.h>
+#include <mysql/mysql_lex_string.h>
 struct st_mysql_lex_string
 {
   char *str;

include/mysql/plugin_ftparser.h.pp

@@ -9,6 +9,7 @@
 size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
 size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
 #include <mysql/service_thd_alloc.h>
+#include <mysql/mysql_lex_string.h>
 struct st_mysql_lex_string
 {
   char *str;

include/mysql/service_thd_alloc.h

@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICE_THD_ALLOC_INCLUDED
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2015, 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
@@ -35,12 +35,7 @@
 extern "C" {
 #endif
 
-struct st_mysql_lex_string
-{
-  char *str;
-  size_t length;
-};
-typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
+#include <mysql/mysql_lex_string.h>
 
 extern struct thd_alloc_service_st {
   void *(*thd_alloc_func)(MYSQL_THD, size_t);

sql-common/client_authentication.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -34,7 +34,7 @@
 #include <openssl/applink.c>
 #endif
 #endif
-#include "mysql/service_my_plugin_log.h"
+#include "mysql/plugin.h"
 
 #define MAX_CIPHER_LENGTH 1024
 

sql/event_data_objects.h

@@ -1,6 +1,6 @@
 #ifndef _EVENT_DATA_OBJECTS_H_
 #define _EVENT_DATA_OBJECTS_H_
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -26,6 +26,7 @@
 #include "thr_lock.h"                           /* thr_lock_type */
 
 class Field;
+class String;
 class THD;
 class Time_zone;
 struct TABLE;

sql/event_queue.h

@@ -1,6 +1,6 @@
 #ifndef _EVENT_QUEUE_H_
 #define _EVENT_QUEUE_H_
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -26,7 +26,7 @@
 */
 
 #include "my_global.h"                          // uint
-#include "sql_string.h"                         /* LEX_STRING */
+#include "mysql/mysql_lex_string.h"             // LEX_STRING
 #include "my_time.h"                    /* my_time_t, interval_type */
 #include "my_pthread.h"                         // mysql_mutex_t
 

sql/events.h

@@ -1,6 +1,6 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -38,16 +38,19 @@ extern PSI_stage_info stage_waiting_on_empty_queue;
 extern PSI_stage_info stage_waiting_for_next_activation;
 extern PSI_stage_info stage_waiting_for_scheduler_to_stop;
 
-#include "sql_string.h"                         /* LEX_STRING */
+#include "mysql/mysql_lex_string.h"             // LEX_STRING
 #include "my_time.h"                            /* interval_type */
 
 class Event_db_repository;
 class Event_parse_data;
 class Event_queue;
 class Event_scheduler;
+class Item;
+class String;
 struct TABLE_LIST;
 class THD;
 typedef struct charset_info_st CHARSET_INFO;
+typedef struct st_mysql_lex_string LEX_STRING;
 
 int
 sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);

sql/gcalc_tools.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -18,7 +18,7 @@
 #define GCALC_TOOLS_INCLUDED
 
 #include "gcalc_slicescan.h"
-
+#include "sql_string.h"                 // String
 
 /*
   The Gcalc_function class objects are used to check for a binary relation.

sql/gstream.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2015, 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
@@ -19,7 +19,7 @@
 */
 
 #include "gstream.h"
-#include "m_string.h"                           // LEX_STRING
+#include "mysql/mysql_lex_string.h"              // LEX_STRING
 /* key_memory_Gis_read_stream_err_msg */
 #include "mysqld.h"
 

sql/item_create.h

@@ -18,8 +18,9 @@
 #ifndef ITEM_CREATE_H
 #define ITEM_CREATE_H
 
-#include "m_string.h"  // LEX_STRING
-#include "item_func.h" // Cast_target
+#include "my_global.h"
+#include "mysql/mysql_lex_string.h"     // LEX_STRING
+#include "item_func.h"                  // Cast_target
 
 class Item;
 class PT_item_list;

sql/ndb_thd_ndb.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2015, 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
@@ -16,6 +16,7 @@
 */
 
 #include "ndb_thd_ndb.h"
+#include "mysql/plugin.h"          // thd_get_thread_id
 
 /*
   Default value for max number of transactions createable against NDB from

sql/opt_trace.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -28,6 +28,7 @@ class sp_head;
 class sp_printable;
 class set_var_base;
 class Cost_estimate;
+class Item;
 
 /**
    @file

sql/parse_file.h

@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -17,8 +17,8 @@
 #ifndef _PARSE_FILE_H_
 #define _PARSE_FILE_H_
 
-#include "my_global.h"                          // uchar
-#include "sql_string.h"                         // LEX_STRING
+#include "my_global.h"                  // uchar
+#include "mysql/mysql_lex_string.h"     // LEX_STRING
 #include "sql_alloc.h"
 
 class THD;

sql/protocol.h

@@ -1,7 +1,7 @@
 #ifndef PROTOCOL_INCLUDED
 #define PROTOCOL_INCLUDED
 
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2015, 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
@@ -23,6 +23,7 @@ class i_string;
 class Field;
 class THD;
 class Item_param;
+class Item;
 typedef struct st_mysql_field MYSQL_FIELD;
 typedef struct st_mysql_rows MYSQL_ROWS;
 

sql/rpl_filter.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -26,6 +26,7 @@
 
 class String;
 struct TABLE_LIST;
+class Item;
 
 typedef struct st_table_rule_ent
 {

sql/sp_pcontext.h

@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2015, 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
@@ -17,7 +17,8 @@
 #ifndef _SP_PCONTEXT_H_
 #define _SP_PCONTEXT_H_
 
-#include "sql_string.h"                         // LEX_STRING
+#include "my_global.h"
+#include "mysql/mysql_lex_string.h"             // LEX_STRING
 #include "mysql_com.h"                          // enum_field_types
 #include "field.h"                              // Create_field
 #include "mem_root_array.h"                     // Mem_root_array

sql/spatial.h

@@ -16,10 +16,11 @@
 #ifndef SPATIAL_INCLUDED
 #define SPATIAL_INCLUDED
 
-#include "sql_string.h"                         /* String, LEX_STRING */
-#include <my_compiler.h>
+#include "my_global.h"
+#include "mysql/mysql_lex_string.h"     // LEX_STRING
 #include "gcalc_tools.h"
 #include "mysqld.h"
+#include "sql_string.h"                 // String
 
 #include <vector>
 #include <algorithm>

sql/sql_alter.h

@@ -20,6 +20,7 @@
 #include "sql_list.h" // List
 
 class Create_field;
+class Item;
 class Key;
 class String;
 struct TABLE_LIST;

sql/sql_data_change.h

@@ -28,6 +28,7 @@
 #include "sql_alloc.h"      // Sql_alloc
 
 struct TABLE;
+class Item;
 template <class T> class List;
 
 enum enum_duplicates { DUP_ERROR, DUP_REPLACE, DUP_UPDATE };

sql/sql_error.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2015, 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
@@ -17,13 +17,13 @@
 #define SQL_ERROR_H
 
 #include "sql_list.h"
-#include "m_string.h" /* LEX_STRING */
 #include "sql_string.h"                        /* String */
 #include "sql_plist.h" /* I_P_List */
 #include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */
 
 class THD;
 class my_decimal;
+typedef struct st_mysql_lex_string LEX_STRING;
 
 ///////////////////////////////////////////////////////////////////////////
 

sql/sql_plugin.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2015, 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
@@ -21,7 +21,7 @@
 
 #include <mysql/plugin.h>
 
-#include "m_string.h"                       /* LEX_STRING */
+#include "mysql/mysql_lex_string.h"         // LEX_STRING
 #include "my_alloc.h"                       /* MEM_ROOT */
 #include "my_getopt.h"                      /* my_option */