Attachment #178662 for bug #215903

View | Details | Raw Unified | Return to bug 215903
Collapse All | Expand All

Lines 2-8 Link Here

(-)databases/mysql80-client/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	PKGNAMESUFFIX= 80-client	6	PKGNAMESUFFIX= 80-client
7		7
8	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)




--- include/CMakeLists.txt.orig	2016-08-25 12:32:09 UTC
+++ include/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
 
 SET(HEADERS 
   ${HEADERS_ABI} 

   my_dbug.h 
   m_string.h
   my_sys.h 
@@ -64,6 +65,81 @@ SET(HEADERS 
   thr_cond.h
   thr_mutex.h
   thr_rwlock.h
+  base64.h
+  c_string_less.h
+  crypt_genhash_impl.h
+  depth_first_search.h
+  dur_prop.h
+  ft_global.h
+  heap.h
+  i_callable.h
+  instance_callback.h
+  lf.h
+  mutex_lock.h
+  my_aes.h
+  my_atomic.h
+  my_base.h
+  my_bit.h
+  my_bitmap.h
+  my_check_opt.h
+  my_compare.h
+  my_compare.h.orig
+  my_default.h
+  my_icp.h
+  my_md5.h
+  my_md5_size.h
+  my_murmur3.h
+  my_rdtsc.h
+  my_rnd.h
+  my_sqlcommand.h
+  my_stacktrace.h
+  my_thread_os_id.h
+  my_time.h
+  my_timer.h
+  my_tree.h
+  my_uctype.h
+  my_user.h
+  myisam.h
+  myisam.h.orig
+  myisammrg.h
+  myisampack.h
+  mysql.h.pp
+  mysql_version.h.in
+  mysys_err.h
+  nullable.h
+  password.h
+  pfs_cond_provider.h
+  pfs_error_provider.h
+  pfs_file_provider.h
+  pfs_idle_provider.h
+  pfs_memory_provider.h
+  pfs_metadata_provider.h
+  pfs_mutex_provider.h
+  pfs_rwlock_provider.h
+  pfs_socket_provider.h
+  pfs_stage_provider.h
+  pfs_statement_provider.h
+  pfs_table_provider.h
+  pfs_thread_provider.h
+  pfs_transaction_provider.h
+  prealloced_array.h
+  priority_queue.h
+  probes_mysql.d.base
+  probes_mysql.h
+  probes_mysql_nodtrace.h
+  queues.h
+  rwlock_scoped_lock.h
+  scope_guard.h
+  service_versions.h
+  sha1.h
+  sha2.h
+  sql_chars.h
+  sql_string.h
+  str_uca_type.h
+  template_utils.h
+  thr_lock.h
+  violite.h
+  welcome_copyright_notice.h
   ${HEADERS_GEN_CONFIGURE}
 )
 
@@ -76,5 +152,9 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
  PATTERN "*.h"
  PATTERN "psi_abi*" EXCLUDE
 )
+INSTALL(DIRECTORY atomic/ DESTINATION ${INSTALL_INCLUDEDIR}/atomic COMPONENT Development 
+ PATTERN "*.h"
+ PATTERN "psi_abi*" EXCLUDE
+)
 
 

Lines 10-45 Link Here

(-)databases/mysql80-client/pkg-plist (-24 / +101 lines)
10	bin/mysqlpump	10	bin/mysqlpump
11	bin/mysqlshow	11	bin/mysqlshow
12	bin/mysqlslap	12	bin/mysqlslap
		13	include/mysql/atomic/gcc_atomic.h
		14	include/mysql/atomic/gcc_sync.h
		15	include/mysql/atomic/generic-msvc.h
		16	include/mysql/atomic/solaris.h
		17	include/mysql/base64.h
		18	include/mysql/big_endian.h
13	include/mysql/binary_log_types.h	19	include/mysql/binary_log_types.h
14	include/mysql/big_endian.h
15	include/mysql/byte_order_generic.h	20	include/mysql/byte_order_generic.h
16	include/mysql/byte_order_generic_x86.h	21	include/mysql/byte_order_generic_x86.h
		22	include/mysql/c_string_less.h
		23	include/mysql/crypt_genhash_impl.h
17	include/mysql/decimal.h	24	include/mysql/decimal.h
		25	include/mysql/depth_first_search.h
		26	include/mysql/dur_prop.h
18	include/mysql/errmsg.h	27	include/mysql/errmsg.h
		28	include/mysql/ft_global.h
19	include/mysql/hash.h	29	include/mysql/hash.h
		30	include/mysql/heap.h
		31	include/mysql/i_callable.h
		32	include/mysql/instance_callback.h
20	include/mysql/keycache.h	33	include/mysql/keycache.h
		34	include/mysql/lf.h
21	include/mysql/little_endian.h	35	include/mysql/little_endian.h
22	include/mysql/m_ctype.h	36	include/mysql/m_ctype.h
23	include/mysql/m_string.h	37	include/mysql/m_string.h
		38	include/mysql/mutex_lock.h
		39	include/mysql/my_aes.h
24	include/mysql/my_alloc.h	40	include/mysql/my_alloc.h
		41	include/mysql/my_atomic.h
		42	include/mysql/my_base.h
		43	include/mysql/my_bit.h
		44	include/mysql/my_bitmap.h
25	include/mysql/my_byteorder.h	45	include/mysql/my_byteorder.h
		46	include/mysql/my_check_opt.h
26	include/mysql/my_command.h	47	include/mysql/my_command.h
		48	include/mysql/my_compare.h
27	include/mysql/my_compiler.h	49	include/mysql/my_compiler.h
28	include/mysql/my_config.h	50	include/mysql/my_config.h
29	include/mysql/my_dbug.h	51	include/mysql/my_dbug.h
		52	include/mysql/my_default.h
30	include/mysql/my_dir.h	53	include/mysql/my_dir.h
31	include/mysql/my_getopt.h	54	include/mysql/my_getopt.h
32	include/mysql/my_global.h	55	include/mysql/my_global.h
		56	include/mysql/my_icp.h
33	include/mysql/my_list.h	57	include/mysql/my_list.h
		58	include/mysql/my_md5.h
		59	include/mysql/my_md5_size.h
		60	include/mysql/my_murmur3.h
		61	include/mysql/my_rdtsc.h
		62	include/mysql/my_rnd.h
		63	include/mysql/my_sqlcommand.h
		64	include/mysql/my_stacktrace.h
34	include/mysql/my_sys.h	65	include/mysql/my_sys.h
35	include/mysql/my_thread.h	66	include/mysql/my_thread.h
36	include/mysql/my_thread_local.h	67	include/mysql/my_thread_local.h
		68	include/mysql/my_thread_os_id.h
		69	include/mysql/my_time.h
		70	include/mysql/my_timer.h
		71	include/mysql/my_tree.h
		72	include/mysql/my_uctype.h
		73	include/mysql/my_user.h
37	include/mysql/my_xml.h	74	include/mysql/my_xml.h
		75	include/mysql/myisam.h
		76	include/mysql/myisammrg.h
		77	include/mysql/myisampack.h
38	include/mysql/mysql.h	78	include/mysql/mysql.h
		79	include/mysql/mysql.h.pp
39	include/mysql/mysql/client_authentication.h	80	include/mysql/mysql/client_authentication.h
40	include/mysql/mysql/client_plugin.h	81	include/mysql/mysql/client_plugin.h
41	include/mysql/mysql/client_plugin.h.pp	82	include/mysql/mysql/client_plugin.h.pp
42	include/mysql/mysql/com_data.h	83	include/mysql/mysql/com_data.h
		84	include/mysql/mysql/components/component_implementation.h
		85	include/mysql/mysql/components/my_service.h
		86	include/mysql/mysql/components/service.h
		87	include/mysql/mysql/components/service_implementation.h
		88	include/mysql/mysql/components/services/dynamic_loader.h
		89	include/mysql/mysql/components/services/dynamic_loader_scheme_file.h
		90	include/mysql/mysql/components/services/persistent_dynamic_loader.h
		91	include/mysql/mysql/components/services/registry.h
43	include/mysql/mysql/get_password.h	92	include/mysql/mysql/get_password.h
44	include/mysql/mysql/group_replication_priv.h	93	include/mysql/mysql/group_replication_priv.h
45	include/mysql/mysql/innodb_priv.h	94	include/mysql/mysql/innodb_priv.h
Lines 58-80 Link Here
58	include/mysql/mysql/plugin_query_rewrite.h	107	include/mysql/mysql/plugin_query_rewrite.h
59	include/mysql/mysql/plugin_trace.h	108	include/mysql/mysql/plugin_trace.h
60	include/mysql/mysql/plugin_validate_password.h	109	include/mysql/mysql/plugin_validate_password.h
61	include/mysql/mysql/components/component_implementation.h
62	include/mysql/mysql/components/my_service.h
63	include/mysql/mysql/components/service.h
64	include/mysql/mysql/components/service_implementation.h
65	include/mysql/mysql/components/services/dynamic_loader.h
66	include/mysql/mysql/components/services/dynamic_loader_scheme_file.h
67	include/mysql/mysql/components/services/persistent_dynamic_loader.h
68	include/mysql/mysql/components/services/registry.h
69	include/mysql/mysql/psi/mysql_cond.h	110	include/mysql/mysql/psi/mysql_cond.h
70	include/mysql/mysql/psi/mysql_error.h	111	include/mysql/mysql/psi/mysql_error.h
		112	include/mysql/mysql/psi/mysql_file.h
		113	include/mysql/mysql/psi/mysql_idle.h
		114	include/mysql/mysql/psi/mysql_mdl.h
		115	include/mysql/mysql/psi/mysql_memory.h
71	include/mysql/mysql/psi/mysql_mutex.h	116	include/mysql/mysql/psi/mysql_mutex.h
		117	include/mysql/mysql/psi/mysql_ps.h
72	include/mysql/mysql/psi/mysql_rwlock.h	118	include/mysql/mysql/psi/mysql_rwlock.h
		119	include/mysql/mysql/psi/mysql_socket.h
		120	include/mysql/mysql/psi/mysql_sp.h
		121	include/mysql/mysql/psi/mysql_stage.h
		122	include/mysql/mysql/psi/mysql_statement.h
		123	include/mysql/mysql/psi/mysql_table.h
		124	include/mysql/mysql/psi/mysql_thread.h
		125	include/mysql/mysql/psi/mysql_transaction.h
		126	include/mysql/mysql/psi/psi_base.h
73	include/mysql/mysql/psi/psi_cond.h	127	include/mysql/mysql/psi/psi_cond.h
74	include/mysql/mysql/psi/psi_error.h	128	include/mysql/mysql/psi/psi_error.h
75	include/mysql/mysql/psi/psi_file.h	129	include/mysql/mysql/psi/psi_file.h
76	include/mysql/mysql/psi/psi_idle.h	130	include/mysql/mysql/psi/psi_idle.h
77	include/mysql/mysql/psi/psi_mdl.h	131	include/mysql/mysql/psi/psi_mdl.h
		132	include/mysql/mysql/psi/psi_memory.h
78	include/mysql/mysql/psi/psi_mutex.h	133	include/mysql/mysql/psi/psi_mutex.h
79	include/mysql/mysql/psi/psi_rwlock.h	134	include/mysql/mysql/psi/psi_rwlock.h
80	include/mysql/mysql/psi/psi_socket.h	135	include/mysql/mysql/psi/psi_socket.h
Lines 83-102 Link Here
83	include/mysql/mysql/psi/psi_table.h	138	include/mysql/mysql/psi/psi_table.h
84	include/mysql/mysql/psi/psi_thread.h	139	include/mysql/mysql/psi/psi_thread.h
85	include/mysql/mysql/psi/psi_transaction.h	140	include/mysql/mysql/psi/psi_transaction.h
86	include/mysql/mysql/psi/mysql_file.h
87	include/mysql/mysql/psi/mysql_idle.h
88	include/mysql/mysql/psi/mysql_mdl.h
89	include/mysql/mysql/psi/mysql_memory.h
90	include/mysql/mysql/psi/mysql_ps.h
91	include/mysql/mysql/psi/mysql_socket.h
92	include/mysql/mysql/psi/mysql_sp.h
93	include/mysql/mysql/psi/mysql_stage.h
94	include/mysql/mysql/psi/mysql_statement.h
95	include/mysql/mysql/psi/mysql_table.h
96	include/mysql/mysql/psi/mysql_thread.h
97	include/mysql/mysql/psi/mysql_transaction.h
98	include/mysql/mysql/psi/psi_base.h
99	include/mysql/mysql/psi/psi_memory.h
100	include/mysql/mysql/service_command.h	141	include/mysql/mysql/service_command.h
101	include/mysql/mysql/service_locking.h	142	include/mysql/mysql/service_locking.h
102	include/mysql/mysql/service_my_plugin_log.h	143	include/mysql/mysql/service_my_plugin_log.h
Lines 125-132 Link Here
125	include/mysql/mysql_com_server.h	166	include/mysql/mysql_com_server.h
126	include/mysql/mysql_time.h	167	include/mysql/mysql_time.h
127	include/mysql/mysql_version.h	168	include/mysql/mysql_version.h
		169	include/mysql/mysql_version.h.in
128	include/mysql/mysqld_ername.h	170	include/mysql/mysqld_ername.h
129	include/mysql/mysqld_error.h	171	include/mysql/mysqld_error.h
		172	include/mysql/mysys_err.h
		173	include/mysql/nullable.h
		174	include/mysql/password.h
		175	include/mysql/pfs_cond_provider.h
		176	include/mysql/pfs_error_provider.h
		177	include/mysql/pfs_file_provider.h
		178	include/mysql/pfs_idle_provider.h
		179	include/mysql/pfs_memory_provider.h
		180	include/mysql/pfs_metadata_provider.h
		181	include/mysql/pfs_mutex_provider.h
		182	include/mysql/pfs_rwlock_provider.h
		183	include/mysql/pfs_socket_provider.h
		184	include/mysql/pfs_stage_provider.h
		185	include/mysql/pfs_statement_provider.h
		186	include/mysql/pfs_table_provider.h
		187	include/mysql/pfs_thread_provider.h
		188	include/mysql/pfs_transaction_provider.h
130	include/mysql/plugin.h	189	include/mysql/plugin.h
131	include/mysql/plugin_audit.h	190	include/mysql/plugin_audit.h
132	include/mysql/plugin_ftparser.h	191	include/mysql/plugin_ftparser.h
Lines 133-153 Link Here
133	include/mysql/plugin_group_replication.h	192	include/mysql/plugin_group_replication.h
134	include/mysql/plugin_keyring.h	193	include/mysql/plugin_keyring.h
135	include/mysql/plugin_validate_password.h	194	include/mysql/plugin_validate_password.h
		195	include/mysql/prealloced_array.h
		196	include/mysql/priority_queue.h
		197	include/mysql/probes_mysql.d.base
		198	include/mysql/probes_mysql.h
		199	include/mysql/probes_mysql_nodtrace.h
		200	include/mysql/queues.h
		201	include/mysql/rwlock_scoped_lock.h
		202	include/mysql/scope_guard.h
		203	include/mysql/service_versions.h
		204	include/mysql/sha1.h
		205	include/mysql/sha2.h
		206	include/mysql/sql_chars.h
136	include/mysql/sql_common.h	207	include/mysql/sql_common.h
		208	include/mysql/sql_string.h
137	include/mysql/sslopt-case.h	209	include/mysql/sslopt-case.h
138	include/mysql/sslopt-longopts.h	210	include/mysql/sslopt-longopts.h
139	include/mysql/sslopt-vars.h	211	include/mysql/sslopt-vars.h
		212	include/mysql/str_uca_type.h
		213	include/mysql/template_utils.h
140	include/mysql/thr_cond.h	214	include/mysql/thr_cond.h
		215	include/mysql/thr_lock.h
141	include/mysql/thr_mutex.h	216	include/mysql/thr_mutex.h
142	include/mysql/thr_rwlock.h	217	include/mysql/thr_rwlock.h
143	include/mysql/typelib.h	218	include/mysql/typelib.h
		219	include/mysql/violite.h
		220	include/mysql/welcome_copyright_notice.h
144	lib/mysql/libmysqlclient.a	221	lib/mysql/libmysqlclient.a
145	lib/mysql/libmysqlclient.so	222	lib/mysql/libmysqlclient.so
146	lib/mysql/libmysqlclient.so.21	223	lib/mysql/libmysqlclient.so.21
147	lib/mysql/libmysqlservices.a
148	lib/mysql/libmysqlclient_r.a	224	lib/mysql/libmysqlclient_r.a
149	lib/mysql/libmysqlclient_r.so	225	lib/mysql/libmysqlclient_r.so
150	lib/mysql/libmysqlclient_r.so.21	226	lib/mysql/libmysqlclient_r.so.21
		227	lib/mysql/libmysqlservices.a
151	libdata/pkgconfig/mysqlclient.pc	228	libdata/pkgconfig/mysqlclient.pc
152	man/man1/comp_err.1.gz	229	man/man1/comp_err.1.gz
153	man/man1/mysql.1.gz	230	man/man1/mysql.1.gz

Line 0 Link Here

(-)databases/php70-mysqli/files/patch-mysqli.c (+11 lines)
	1	--- mysqli.c.orig 2016-12-06 18:05:01 UTC
	2	+++ mysqli.c
	3	@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli)
	4	#ifdef MYSQLND_STRING_TO_INT_CONVERSION
	5	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS \| CONST_PERSISTENT);
	6	#endif
	7	-#if MYSQL_VERSION_ID > 50110 \|\| defined(MYSQLI_USE_MYSQLND)
	8	+#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) \|\| defined(MYSQLI_USE_MYSQLND)
	9	REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS \| CONST_PERSISTENT);
	10	#endif
	11

Return to bug 215903

Lines 1-6 Link Here

(-)databases/mysql80-client/files/patch-include_CMakeLists.txt (-2 / +94 lines)
1	--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC	1	--- include/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -38,6 +38,7 @@ SET(HEADERS_ABI	3	@@ -37,6 +37,7 @@ SET(HEADERS_ABI
4		4
5	SET(HEADERS	5	SET(HEADERS
6	${HEADERS_ABI}	6	${HEADERS_ABI}
Lines 8-10 Link Here
8	my_dbug.h	8	my_dbug.h
9	m_string.h	9	m_string.h
10	my_sys.h	10	my_sys.h
		11	@@ -64,6 +65,81 @@ SET(HEADERS
		12	thr_cond.h
		13	thr_mutex.h
		14	thr_rwlock.h
		15	+ base64.h
		16	+ c_string_less.h
		17	+ crypt_genhash_impl.h
		18	+ depth_first_search.h
		19	+ dur_prop.h
		20	+ ft_global.h
		21	+ heap.h
		22	+ i_callable.h
		23	+ instance_callback.h
		24	+ lf.h
		25	+ mutex_lock.h
		26	+ my_aes.h
		27	+ my_atomic.h
		28	+ my_base.h
		29	+ my_bit.h
		30	+ my_bitmap.h
		31	+ my_check_opt.h
		32	+ my_compare.h
		33	+ my_compare.h.orig
		34	+ my_default.h
		35	+ my_icp.h
		36	+ my_md5.h
		37	+ my_md5_size.h
		38	+ my_murmur3.h
		39	+ my_rdtsc.h
		40	+ my_rnd.h
		41	+ my_sqlcommand.h
		42	+ my_stacktrace.h
		43	+ my_thread_os_id.h
		44	+ my_time.h
		45	+ my_timer.h
		46	+ my_tree.h
		47	+ my_uctype.h
		48	+ my_user.h
		49	+ myisam.h
		50	+ myisam.h.orig
		51	+ myisammrg.h
		52	+ myisampack.h
		53	+ mysql.h.pp
		54	+ mysql_version.h.in
		55	+ mysys_err.h
		56	+ nullable.h
		57	+ password.h
		58	+ pfs_cond_provider.h
		59	+ pfs_error_provider.h
		60	+ pfs_file_provider.h
		61	+ pfs_idle_provider.h
		62	+ pfs_memory_provider.h
		63	+ pfs_metadata_provider.h
		64	+ pfs_mutex_provider.h
		65	+ pfs_rwlock_provider.h
		66	+ pfs_socket_provider.h
		67	+ pfs_stage_provider.h
		68	+ pfs_statement_provider.h
		69	+ pfs_table_provider.h
		70	+ pfs_thread_provider.h
		71	+ pfs_transaction_provider.h
		72	+ prealloced_array.h
		73	+ priority_queue.h
		74	+ probes_mysql.d.base
75	+ probes_mysql.h
76	+ probes_mysql_nodtrace.h
77	+ queues.h
78	+ rwlock_scoped_lock.h
79	+ scope_guard.h
80	+ service_versions.h
81	+ sha1.h
82	+ sha2.h
83	+ sql_chars.h
84	+ sql_string.h
85	+ str_uca_type.h
86	+ template_utils.h
87	+ thr_lock.h
88	+ violite.h
89	+ welcome_copyright_notice.h
90	${HEADERS_GEN_CONFIGURE}
91	)
92
93	@@ -76,5 +152,9 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
94	PATTERN "*.h"
95	PATTERN "psi_abi*" EXCLUDE
96	)
97	+INSTALL(DIRECTORY atomic/ DESTINATION ${INSTALL_INCLUDEDIR}/atomic COMPONENT Development
98	+ PATTERN "*.h"
99	+ PATTERN "psi_abi*" EXCLUDE
100	+)
101
102