18 files changed, 117 insertions, 27 deletions

diff --git a/databases/mysql323-server/files/patch-ar b/databases/mysql323-server/files/patch-ar
index ed7654838e66..225e54365394 100644
--- a/databases/mysql323-server/files/patch-ar
+++ b/databases/mysql323-server/files/patch-ar
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql323-server/pkg-plist.client b/databases/mysql323-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql323-server/pkg-plist.client
+++ b/databases/mysql323-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql40-server/files/patch-include::Makefile.in b/databases/mysql40-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql40-server/files/patch-include::Makefile.in
+++ b/databases/mysql40-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql40-server/pkg-plist.client
+++ b/databases/mysql40-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql41-server/files/patch-include::Makefile.in b/databases/mysql41-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql41-server/files/patch-include::Makefile.in
+++ b/databases/mysql41-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql41-server/pkg-plist.client
+++ b/databases/mysql41-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql50-server/files/patch-include::Makefile.in b/databases/mysql50-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql50-server/files/patch-include::Makefile.in
+++ b/databases/mysql50-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql50-server/pkg-plist.client
+++ b/databases/mysql50-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql51-server/files/patch-include::Makefile.in b/databases/mysql51-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql51-server/files/patch-include::Makefile.in
+++ b/databases/mysql51-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql51-server/pkg-plist.client
+++ b/databases/mysql51-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql54-server/files/patch-include::Makefile.in b/databases/mysql54-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql54-server/files/patch-include::Makefile.in
+++ b/databases/mysql54-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql54-server/pkg-plist.client
+++ b/databases/mysql54-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql55-server/files/patch-include::Makefile.in b/databases/mysql55-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql55-server/files/patch-include::Makefile.in
+++ b/databases/mysql55-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/mysql60-server/files/patch-include::Makefile.in b/databases/mysql60-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/mysql60-server/files/patch-include::Makefile.in
+++ b/databases/mysql60-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
diff --git a/databases/percona55-server/files/patch-include::Makefile.in b/databases/percona55-server/files/patch-include::Makefile.in
index ed7654838e66..225e54365394 100644
--- a/databases/percona55-server/files/patch-include::Makefile.in
+++ b/databases/percona55-server/files/patch-include::Makefile.in
@@ -1,6 +1,15 @@
---- include/Makefile.in.orig	Sat Jan  1 17:59:41 2000
-+++ include/Makefile.in	Wed Jan  5 21:04:23 2000
-@@ -259,7 +259,11 @@
+--- include/Makefile.in.orig	Tue Oct 17 16:10:42 2000
++++ include/Makefile.in	Wed Nov  8 17:26:09 2000
+@@ -168,7 +168,7 @@
+ uname_prog = @uname_prog@
+ 
+ BUILT_SOURCES = mysql_version.h m_ctype.h
+-pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
++pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h 			mysqld_error.h my_config.h my_list.h 		        my_pthread.h my_no_pthread.h raid.h errmsg.h 			my_global.h my_net.h 			sslopt-case.h sslopt-longopts.h sslopt-usage.h 			sslopt-vars.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = global.h config-win.h 			nisam.h heap.h merge.h 			myisam.h myisampack.h myisammrg.h ft_global.h 			my_dir.h mysys_err.h my_base.h 			my_nosys.h my_alarm.h queues.h 			my_tree.h hash.h thr_alarm.h thr_lock.h 			getopt.h t_ctype.h violite.h 			mysql_version.h.in
+ 
+@@ -282,7 +282,11 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index 533a150df6f5..b2864e34adcd 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -9,6 +9,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h