MDEV-207 Install headers required to build external storage plugins

install all private headers in mysql/private/

7 files changed, 88 insertions, 81 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index a082926db5b..793c73718bd 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -35,7 +35,8 @@ pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
 			$(HEADERS_GEN_CONFIGURE) \
 			$(HEADERS_GEN_MAKE)
 
-noinst_HEADERS =	config-win.h config-netware.h lf.h my_bit.h \
+internalincludedir =	$(pkgincludedir)/private
+internalinclude_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
 			heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \
 			myisam.h myisampack.h myisammrg.h ft_global.h\
 			mysys_err.h my_base.h help_start.h help_end.h \
@@ -44,13 +45,16 @@ noinst_HEADERS =	config-win.h config-netware.h lf.h my_bit.h \
 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
 			service_versions.h \
 			my_compare.h my_handler.h my_time.h \
-			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
-			atomic/rwlock.h atomic/x86-gcc.h \
-			atomic/generic-msvc.h \
-                        atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
+			my_vle.h my_user.h my_atomic.h my_libwrap.h my_stacktrace.h \
                         wqueue.h waiting_threads.h \
 			welcome_copyright_notice.h
 
+atomicincludedir =      $(internalincludedir)/atomic
+atomicinclude_HEADERS = atomic/nolock.h \
+			atomic/rwlock.h atomic/x86-gcc.h \
+			atomic/generic-msvc.h \
+                        atomic/gcc_builtins.h
+
 EXTRA_DIST =            mysql.h.pp mysql/plugin_auth.h.pp mysql/client_plugin.h.pp CMakeLists.txt
 
 # Remove built files and the symlinked directories
diff --git a/include/maria.h b/include/maria.h
index 6020f0c672c..0844e3f58c4 100644
--- a/include/maria.h
+++ b/include/maria.h
@@ -24,7 +24,6 @@ extern "C" {
 #include <my_base.h>
 #include <my_sys.h>
 #include <m_ctype.h>
-#include "../storage/maria/ma_pagecache.h"
 #include "my_handler.h"
 #include "my_compare.h"
 #include "ft_global.h"
@@ -271,7 +270,6 @@ extern my_bool maria_flush, maria_single_user, maria_page_checksums;
 extern my_bool maria_delay_key_write;
 extern my_off_t maria_max_temp_length;
 extern ulong maria_bulk_insert_tree_size, maria_data_pointer_size;
-extern PAGECACHE maria_pagecache_var, *maria_pagecache;
 extern MY_TMPDIR *maria_tmpdir;
 /*
   This is used to check if a symlink points into the mysql data home,
@@ -356,71 +354,6 @@ typedef struct st_maria_bit_buff
   uint error;
 } MARIA_BIT_BUFF;
 
-
-typedef struct st_maria_sort_info
-{
-#ifdef THREAD
-  /* sync things */
-  pthread_mutex_t mutex;
-  pthread_cond_t cond;
-#endif
-  MARIA_HA *info, *new_info;
-  HA_CHECK *param;
-  char *buff;
-  SORT_KEY_BLOCKS *key_block, *key_block_end;
-  SORT_FT_BUF *ft_buf;
-  my_off_t filelength, dupp, buff_length;
-  pgcache_page_no_t page;
-  ha_rows max_records;
-  uint current_key, total_keys;
-  uint got_error, threads_running;
-  myf myf_rw;
-  enum data_file_type new_data_file_type, org_data_file_type;
-} MARIA_SORT_INFO;
-
-typedef struct st_maria_sort_param
-{
-  pthread_t thr;
-  IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
-  DYNAMIC_ARRAY buffpek;
-  MARIA_BIT_BUFF bit_buff;               /* For parallel repair of packrec. */
-  
-  MARIA_KEYDEF *keyinfo;
-  MARIA_SORT_INFO *sort_info;
-  HA_KEYSEG *seg;
-  uchar **sort_keys;
-  uchar *rec_buff;
-  void *wordlist, *wordptr;
-  MEM_ROOT wordroot;
-  uchar *record;
-  MY_TMPDIR *tmpdir;
-
-  /* 
-    The next two are used to collect statistics, see maria_update_key_parts for
-    description.
-  */
-  ulonglong unique[HA_MAX_KEY_SEG+1];
-  ulonglong notnull[HA_MAX_KEY_SEG+1];
-
-  MARIA_RECORD_POS pos,max_pos,filepos,start_recpos, current_filepos;
-  uint key, key_length,real_key_length,sortbuff_size;
-  uint maxbuffers, keys, find_length, sort_keys_length;
-  my_bool fix_datafile, master;
-  my_bool calc_checksum;                /* calculate table checksum */
-  size_t rec_buff_size;
-
-  int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *);
-  int (*key_read)(struct st_maria_sort_param *, uchar *);
-  int (*key_write)(struct st_maria_sort_param *, const uchar *);
-  void (*lock_in_memory)(HA_CHECK *);
-  int (*write_keys)(struct st_maria_sort_param *, register uchar **,
-                         uint , struct st_buffpek *, IO_CACHE *);
-  uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint);
-  int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,uchar *,
-                   uint, uint);
-} MARIA_SORT_PARAM;
-
-
 /* functions in maria_check */
 void maria_chk_init(HA_CHECK *param);
 void maria_chk_init_for_check(HA_CHECK *param, MARIA_HA *info);
@@ -448,7 +381,6 @@ int maria_filecopy(HA_CHECK *param, File to, File from, my_off_t start,
                    my_off_t length, const char *type);
 int maria_movepoint(MARIA_HA *info, uchar *record, my_off_t oldpos,
                     my_off_t newpos, uint prot_key);
-int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile);
 int maria_test_if_almost_full(MARIA_HA *info);
 int maria_recreate_table(HA_CHECK *param, MARIA_HA **org_info, char *filename);
 int maria_disable_indexes(MARIA_HA *info);
@@ -461,10 +393,6 @@ my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map,
 int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows);
 void maria_flush_bulk_insert(MARIA_HA *info, uint inx);
 void maria_end_bulk_insert(MARIA_HA *info);
-int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map,
-			      PAGECACHE *key_cache);
-void maria_change_pagecache(PAGECACHE *old_key_cache,
-			    PAGECACHE *new_key_cache);
 int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves);
 void maria_versioning(MARIA_HA *info, my_bool versioning);
 void maria_ignore_trids(MARIA_HA *info);
diff --git a/regex/Makefile.am b/regex/Makefile.am
index 6e46e537c4b..7f4ace4a227 100644
--- a/regex/Makefile.am
+++ b/regex/Makefile.am
@@ -18,7 +18,9 @@
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_LTLIBRARIES =	libregex.la
 LDADD=			libregex.la $(top_builddir)/strings/libmystrings.la
-noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c my_regex.h
+internalincludedir =	$(pkgincludedir)/private
+internalinclude_HEADERS = my_regex.h
+noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c
 libregex_la_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c
 noinst_PROGRAMS =	re
 re_SOURCES =		split.c debug.c main.c
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 34cf21f9775..84198320522 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -47,7 +47,8 @@ mysqld_LDADD =		libndb.la \
 			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
 			$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
 
-noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
+internalincludedir =	$(pkgincludedir)/private
+internalinclude_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h \
 			item_xmlfunc.h sql_plugin_services.h \
 			item_create.h item_subselect.h item_row.h \
diff --git a/sql/sql_select.h b/sql/sql_select.h
index a5c0a797ed6..874ff959b1d 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -32,7 +32,7 @@
 #include <myisam.h>
 
 #if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
-#include "../storage/maria/ha_maria.h"
+#include <maria.h>
 #define TMP_ENGINE_HTON maria_hton
 #else
 #define TMP_ENGINE_HTON myisam_hton
diff --git a/storage/maria/ma_test3.c b/storage/maria/ma_test3.c
index 040d6fa78c2..0dfbf46cafc 100644
--- a/storage/maria/ma_test3.c
+++ b/storage/maria/ma_test3.c
@@ -17,7 +17,7 @@
 
 #if !(defined (__NETWARE_) || defined (_WIN32)) /*no fork() in Windows*/
 
-#include "maria.h"
+#include "maria_def.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h
index d21d438d64b..d68db73bd77 100644
--- a/storage/maria/maria_def.h
+++ b/storage/maria/maria_def.h
@@ -16,6 +16,7 @@
 /* This file is included by all internal maria files */
 
 #include "maria.h"				/* Structs & some defines */
+#include "ma_pagecache.h"
 #include <myisampack.h>				/* packing of keys */
 #include <my_tree.h>
 #include <my_bitmap.h>
@@ -48,6 +49,77 @@
 /* maria_open() flag, specific for maria_pack */
 #define HA_OPEN_IGNORE_MOVED_STATE (1U << 30)
 
+extern PAGECACHE maria_pagecache_var, *maria_pagecache;
+int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map,
+			      PAGECACHE *key_cache);
+void maria_change_pagecache(PAGECACHE *old_key_cache,
+			    PAGECACHE *new_key_cache);
+
+typedef struct st_maria_sort_info
+{
+#ifdef THREAD
+  /* sync things */
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+#endif
+  MARIA_HA *info, *new_info;
+  HA_CHECK *param;
+  char *buff;
+  SORT_KEY_BLOCKS *key_block, *key_block_end;
+  SORT_FT_BUF *ft_buf;
+  my_off_t filelength, dupp, buff_length;
+  pgcache_page_no_t page;
+  ha_rows max_records;
+  uint current_key, total_keys;
+  uint got_error, threads_running;
+  myf myf_rw;
+  enum data_file_type new_data_file_type, org_data_file_type;
+} MARIA_SORT_INFO;
+
+typedef struct st_maria_sort_param
+{
+  pthread_t thr;
+  IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
+  DYNAMIC_ARRAY buffpek;
+  MARIA_BIT_BUFF bit_buff;               /* For parallel repair of packrec. */
+  
+  MARIA_KEYDEF *keyinfo;
+  MARIA_SORT_INFO *sort_info;
+  HA_KEYSEG *seg;
+  uchar **sort_keys;
+  uchar *rec_buff;
+  void *wordlist, *wordptr;
+  MEM_ROOT wordroot;
+  uchar *record;
+  MY_TMPDIR *tmpdir;
+
+  /* 
+    The next two are used to collect statistics, see maria_update_key_parts for
+    description.
+  */
+  ulonglong unique[HA_MAX_KEY_SEG+1];
+  ulonglong notnull[HA_MAX_KEY_SEG+1];
+
+  MARIA_RECORD_POS pos,max_pos,filepos,start_recpos, current_filepos;
+  uint key, key_length,real_key_length,sortbuff_size;
+  uint maxbuffers, keys, find_length, sort_keys_length;
+  my_bool fix_datafile, master;
+  my_bool calc_checksum;                /* calculate table checksum */
+  size_t rec_buff_size;
+
+  int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *);
+  int (*key_read)(struct st_maria_sort_param *, uchar *);
+  int (*key_write)(struct st_maria_sort_param *, const uchar *);
+  void (*lock_in_memory)(HA_CHECK *);
+  int (*write_keys)(struct st_maria_sort_param *, register uchar **,
+                         uint , struct st_buffpek *, IO_CACHE *);
+  uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint);
+  int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,uchar *,
+                   uint, uint);
+} MARIA_SORT_PARAM;
+
+int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile);
+
 struct st_transaction;
 
 /* undef map from my_nosys; We need test-if-disk full */