Ravenports generated: 18 Jan 2021 12:16
[ravenports.git] / bucket_68 / mysql57
1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
2
3 NAMEBASE=               mysql57
4 VERSION=                5.7.32
5 REVISION=               1
6 KEYWORDS=               databases
7 VARIANTS=               standard
8 SDESC[standard]=        Multithreaded SQL database (server)
9 HOMEPAGE=               https://www.mysql.com/
10 CONTACT=                nobody
11
12 DOWNLOAD_GROUPS=        main
13 SITES[main]=            MYSQL/MySQL-5.7
14 DISTFILE[1]=            mysql-boost-5.7.32.tar.gz:main
15 DF_INDEX=               1
16 SPKGS[standard]=        complete
17                         server
18                         client
19
20 OPTIONS_AVAILABLE=      ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE
21                         PARTITION PERFSCHEMA PERFORMANCE ALTSSL
22 OPTIONS_STANDARD=       ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE
23                         PARTITION PERFSCHEMA PERFORMANCE ALTSSL
24 OPTGROUP_UNLIMITED=     STORAGE
25 OPTDESCR[STORAGE]=      Storage engines statically compiled into server
26 OPTGROUP[STORAGE]=      ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE
27                         PARTITION PERFSCHEMA
28 OPT_ON[all]=            PERFORMANCE ALTSSL
29
30 BUILD_DEPENDS=          libedit:single:standard
31 BUILDRUN_DEPENDS=       libevent:single:standard
32 EXRUN[client]=          libedit:single:standard
33                         zlib:complete:standard
34
35 USERS=                  mysql
36 GROUPS=                 mysql
37 USERGROUP_SPKG=         server
38
39 USES=                   bison cmake perl:run shebangfix execinfo pkgconfig
40                         c++:server,client cclibs:server,client zlib lz4 cpe
41
42 DISTNAME=               mysql-5.7.32
43
44 LICENSE=                GPLv2:server
45 LICENSE_TERMS=          server:{{WRKDIR}}/TERMS
46 LICENSE_FILE=           GPLv2:{{WRKSRC}}/README
47 LICENSE_AWK=            TERMS:"^\/\*$$"
48 LICENSE_SOURCE=         TERMS:{{WRKSRC}}/include/mysql.h
49 LICENSE_SCHEME=         solo
50
51 CMAKE_BUILD_TYPE=       Release
52 CPE_PRODUCT=            mysql
53 CPE_VENDOR=             oracle
54 FPC_EQUIVALENT=         databases/mysql57-server
55 SHEBANG_FILES=          scripts/*.pl
56
57 INSTALL_REQ_TOOLCHAIN=  yes
58 PLIST_SUB=              MY_DBDIR=/var/db/mysql
59                         MY_SECDIR=/var/db/mysql_secure
60                         MY_TMPDIR=/var/db/mysql_tmpdir
61 RC_SUBR=                mysql-server:server
62 SUB_FILES=              my.cnf.sample
63 SUB_LIST=               MY_DBDIR=/var/db/mysql
64                         MY_SECDIR=/var/db/mysql_secure
65                         MY_TMPDIR=/var/db/mysql_tmpdir
66
67 CFLAGS=                 -Wno-deprecated-declarations
68 CMAKE_ARGS=             -DINSTALL_PKGCONFIGDIR="{{LOCALBASE}}/lib/pkgconfig"
69                         -DINSTALL_DOCDIR="share/doc/mysql"
70                         -DINSTALL_DOCREADMEDIR="share/doc/mysql"
71                         -DINSTALL_INCLUDEDIR="include/mysql"
72                         -DINSTALL_INFODIR="share/info"
73                         -DINSTALL_LIBDIR="lib/mysql"
74                         -DINSTALL_MANDIR="share/man"
75                         -DINSTALL_MYSQLDATADIR="/var/db/mysql"
76                         -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring"
77                         -DINSTALL_MYSQLSHAREDIR="share/mysql"
78                         -DINSTALL_MYSQLTESTDIR="share/mysql/tests"
79                         -DINSTALL_PLUGINDIR="lib/mysql/plugin"
80                         -DINSTALL_SBINDIR="libexec"
81                         -DINSTALL_SCRIPTDIR="bin"
82                         -DINSTALL_SECURE_FILE_PRIVDIR="/var/db/mysql_secure"
83                         -DINSTALL_SHAREDIR="share"
84                         -DINSTALL_SUPPORTFILESDIR="share/mysql"
85                         -DMYSQL_KEYRINGDIR="etc/mysql/keyring"
86                         -DWITH_BOOST="{{WRKSRC}}/boost"
87                         -DWITH_EDITLINE=system
88                         -DWITH_LIBEVENT=system
89                         -DWITH_LZ4=system
90                         -DWITH_ZLIB=system
91                         -DWITH_SSL={{OPENSSLBASE}}
92                         -DWITH_EMBEDDED_SERVER="ON"
93                         -DINSTALL_MYSQLTESTDIR=0
94
95 [PERFSCHEMA].DESCRIPTION=               Provide "Performance Schema Storage" engine
96 [PERFSCHEMA].CMAKE_ARGS_ON=             -DWITH_PERFSCHEMA_STORAGE_ENGINE=1
97
98 [EXAMPLE].DESCRIPTION=                  Provide "Example Storage" engine
99 [EXAMPLE].CMAKE_ARGS_ON=                -DWITH_EXAMPLE_STORAGE_ENGINE=1
100
101 [PARTITION].DESCRIPTION=                Provide "Partitioning support Storage" engine
102 [PARTITION].CMAKE_ARGS_ON=              -DWITH_PARTITION_STORAGE_ENGINE=1
103
104 [ALTSSL].DESCRIPTION=                   Use OpenSSL 1.1 instead of default SSL variant
105 [ALTSSL].USES_OFF=                      ssl:build
106 [ALTSSL].USES_ON=                       ssl:openssl-devel,build
107
108 [BLACKHOLE].DESCRIPTION=                Provide "Blackhole Storage" engine
109 [BLACKHOLE].CMAKE_ARGS_ON=              -DWITH_BLACKHOLE_STORAGE_ENGINE=1
110
111 [PERFORMANCE].DESCRIPTION=              Enable "Performance Schema" (High RAM usage)
112 [PERFORMANCE].SUB_LIST_OFF=             PERFSCHEMRC="--skip-performance-schema"
113 [PERFORMANCE].SUB_LIST_ON=              PERFSCHEMRC=""
114
115 [ARCHIVE].DESCRIPTION=                  Provide "Archive Storage" engine
116 [ARCHIVE].CMAKE_ARGS_ON=                -DWITH_ARCHIVE_STORAGE_ENGINE=1
117
118 [FEDERATED].DESCRIPTION=                Provide "Federated Storage" engine
119 [FEDERATED].CMAKE_ARGS_ON=              -DWITH_FEDERATED_STORAGE_ENGINE=1
120 [FEDERATED].SUB_LIST_OFF=               FEDER=""
121 [FEDERATED].SUB_LIST_ON=                FEDER="--federated"
122
123 [INNOBASE].DESCRIPTION=                 Provide "InnoDB Storage" engine
124 [INNOBASE].CMAKE_ARGS_ON=               -DWITH_INNOBASE_STORAGE_ENGINE=1
125
126 post-patch:
127         ${REINPLACE_CMD} -e 's|/usr/bin/perl|${PREFIX}/bin/perl|' \
128                 -e 's|/usr/local/bin/perl|${PREFIX}/bin/perl|' \
129                 ${WRKSRC}/scripts/CMakeLists.txt
130         # don't build authentication ldap on any platform (yet)
131         ${REINPLACE_CMD} -e '/authentication_ldap/d' \
132                 ${WRKSRC}/libmysql/CMakeLists.txt
133
134 post-install:
135         ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mysql/keyring \
136                 ${STAGEDIR}/var/db/mysql_secure \
137                 ${STAGEDIR}/var/db/mysql_tmpdir
138         ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample \
139                 ${STAGEDIR}${ETCDIR}/my.cnf.sample
140         ${RM} ${STAGEDIR}${MANPREFIX}/man/man1/zlib_decompress.1 \
141                 ${STAGEDIR}${MANPREFIX}/man/man1/lz4_decompress.1
142         ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/lib*.so
143         ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/*.so
144         ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/mysqld
145         # Linux doesn't like -R flags
146         ${SED} -i'' -e 's| -R| -Wl,-rpath,|g' \
147                 ${STAGEDIR}${PREFIX}/bin/mysql_config
148         list=$$(cd ${STAGEDIR}${PREFIX}/bin && ${LS} * | ${AWK} \
149                 '{ if ($$1 != "mysql_config" && $$1 != "mysqld_mult" && \
150                 $$1 != "mysqld_safe" && $$1 != "mysqldumpslow" && \
151                 $$1 != "mysqld_multi") print}'); \
152         (cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} $$list)
153
154 post-extract:
155         ${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
156
157 post-patch-freebsd:
158         ${RM} ${WRKSRC}/cmake/os/FreeBSD.cmake
159
160 [FILE:294:descriptions/desc.server]
161 MySQL is a very fast, multi-threaded, multi-user and robust SQL
162 (Structured Query Language) database server.
163
164 MySQL, the most popular Open Source SQL database management system, is
165 developed, distributed, and supported by Oracle Corporation.
166
167 This package contains the MySQL server components.
168
169
170 [FILE:150:descriptions/desc.client]
171 MySQL is a very fast, multi-threaded, multi-user and robust SQL
172 (Structured Query Language) database server.
173
174 This package contains the MySQL client.
175
176
177 [FILE:104:distinfo]
178 9a8a04a2b0116ccff9a8d8aace07aaeaacf47329b701c5dfa9fa4351d3f1933b     52882168 mysql-boost-5.7.32.tar.gz
179
180
181 [FILE:3543:manifests/plist.server]
182 %%ONLY-LINUX%%lib/mysql/plugin/auth_socket.so
183 bin/
184  innochecksum
185  lz4_decompress
186  my_print_defaults
187  myisam_ftdump
188  myisamchk
189  myisamlog
190  myisampack
191  mysql_install_db
192  mysql_plugin
193  mysql_secure_installation
194  mysql_tzinfo_to_sql
195  mysql_upgrade
196  mysqld_multi
197  mysqld_safe
198  mysqldumpslow
199  mysqltest
200  mysqlxtest
201  perror
202  replace
203  resolve_stack_dump
204  resolveip
205  zlib_decompress
206 lib/mysql/libmysqld.a
207 lib/mysql/plugin/
208  adt_null.so
209  auth.so
210  auth_test_plugin.so
211  connection_control.so
212  daemon_example.ini
213  group_replication.so
214  ha_example.so
215  keyring_file.so
216  keyring_udf.so
217  libdaemon_example.so
218  libtest_framework.so
219  libtest_services.so
220  libtest_services_threaded.so
221  libtest_session_detach.so
222  libtest_session_in_thd.so
223  libtest_session_info.so
224  libtest_sql_2_sessions.so
225  libtest_sql_all_col_types.so
226  libtest_sql_cmds_1.so
227  libtest_sql_commit.so
228  libtest_sql_complex.so
229  libtest_sql_errors.so
230  libtest_sql_lock.so
231  libtest_sql_processlist.so
232  libtest_sql_replication.so
233  libtest_sql_shutdown.so
234  libtest_sql_sqlmode.so
235  libtest_sql_stored_procedures_functions.so
236  libtest_sql_views_triggers.so
237  libtest_x_sessions_deinit.so
238  libtest_x_sessions_init.so
239  locking_service.so
240  mypluglib.so
241  mysql_no_login.so
242  mysqlx.so
243  qa_auth_client.so
244  qa_auth_interface.so
245  qa_auth_server.so
246  replication_observers_example_plugin.so
247  rewrite_example.so
248  rewriter.so
249  semisync_master.so
250  semisync_slave.so
251  test_security_context.so
252  test_udf_services.so
253  udf_example.so
254  validate_password.so
255  version_token.so
256 libexec/mysqld
257 share/man/man1/
258  innochecksum.1.gz
259  my_print_defaults.1.gz
260  myisam_ftdump.1.gz
261  myisamchk.1.gz
262  myisamlog.1.gz
263  myisampack.1.gz
264  mysql.server.1.gz
265  mysql_install_db.1.gz
266  mysql_plugin.1.gz
267  mysql_secure_installation.1.gz
268  mysql_ssl_rsa_setup.1.gz
269  mysql_tzinfo_to_sql.1.gz
270  mysql_upgrade.1.gz
271  mysqld_multi.1.gz
272  mysqld_safe.1.gz
273  mysqldumpslow.1.gz
274  mysqlman.1.gz
275  perror.1.gz
276  replace.1.gz
277  resolve_stack_dump.1.gz
278  resolveip.1.gz
279 share/man/man8/mysqld.8.gz
280 share/mysql/
281  dictionary.txt
282  errmsg-utf8.txt
283  fill_help_tables.sql
284  innodb_memcached_config.sql
285  install_rewriter.sql
286  magic
287  mysql-log-rotate
288  mysql.server
289  mysql_security_commands.sql
290  mysql_sys_schema.sql
291  mysql_system_tables.sql
292  mysql_system_tables_data.sql
293  mysql_test_data_timezone.sql
294  mysqld_multi.server
295  uninstall_rewriter.sql
296 share/mysql/bulgarian/errmsg.sys
297 share/mysql/charsets/
298  Index.xml
299  README
300  armscii8.xml
301  ascii.xml
302  cp1250.xml
303  cp1251.xml
304  cp1256.xml
305  cp1257.xml
306  cp850.xml
307  cp852.xml
308  cp866.xml
309  dec8.xml
310  geostd8.xml
311  greek.xml
312  hebrew.xml
313  hp8.xml
314  keybcs2.xml
315  koi8r.xml
316  koi8u.xml
317  latin1.xml
318  latin2.xml
319  latin5.xml
320  latin7.xml
321  macce.xml
322  macroman.xml
323  swe7.xml
324 share/mysql/czech/errmsg.sys
325 share/mysql/danish/errmsg.sys
326 share/mysql/dutch/errmsg.sys
327 share/mysql/english/errmsg.sys
328 share/mysql/estonian/errmsg.sys
329 share/mysql/french/errmsg.sys
330 share/mysql/german/errmsg.sys
331 share/mysql/greek/errmsg.sys
332 share/mysql/hungarian/errmsg.sys
333 share/mysql/italian/errmsg.sys
334 share/mysql/japanese/errmsg.sys
335 share/mysql/korean/errmsg.sys
336 share/mysql/norwegian/errmsg.sys
337 share/mysql/norwegian-ny/errmsg.sys
338 share/mysql/polish/errmsg.sys
339 share/mysql/portuguese/errmsg.sys
340 share/mysql/romanian/errmsg.sys
341 share/mysql/russian/errmsg.sys
342 share/mysql/serbian/errmsg.sys
343 share/mysql/slovak/errmsg.sys
344 share/mysql/spanish/errmsg.sys
345 share/mysql/swedish/errmsg.sys
346 share/mysql/ukrainian/errmsg.sys
347 @dir(mysql,mysql,0750) %%MY_SECDIR%%
348 @dir(mysql,mysql,0750) %%MY_TMPDIR%%
349 @dir(mysql,mysql,0750) etc/mysql/keyring
350 @sample(root,wheel,0644) etc/mysql/my.cnf.sample
351
352
353 [FILE:2466:manifests/plist.client]
354 bin/
355  mysql
356  mysql_client_test
357  mysql_config
358  mysql_config_editor
359  mysql_ssl_rsa_setup
360  mysqladmin
361  mysqlbinlog
362  mysqlcheck
363  mysqldump
364  mysqlimport
365  mysqlpump
366  mysqlshow
367  mysqlslap
368 include/mysql/
369  big_endian.h
370  binary_log_types.h
371  byte_order_generic.h
372  byte_order_generic_x86.h
373  decimal.h
374  errmsg.h
375  keycache.h
376  little_endian.h
377  m_ctype.h
378  m_string.h
379  my_alloc.h
380  my_byteorder.h
381  my_command.h
382  my_compiler.h
383  my_config.h
384  my_dbug.h
385  my_dir.h
386  my_getopt.h
387  my_global.h
388  my_list.h
389  my_sys.h
390  my_thread.h
391  my_thread_local.h
392  my_xml.h
393  mysql.h
394  mysql_com.h
395  mysql_com_server.h
396  mysql_embed.h
397  mysql_time.h
398  mysql_version.h
399  mysqld_ername.h
400  mysqld_error.h
401  plugin.h
402  plugin_audit.h
403  plugin_ftparser.h
404  plugin_group_replication.h
405  plugin_keyring.h
406  plugin_validate_password.h
407  sql_common.h
408  sql_state.h
409  sslopt-case.h
410  sslopt-longopts.h
411  sslopt-vars.h
412  thr_cond.h
413  thr_mutex.h
414  thr_rwlock.h
415  typelib.h
416 include/mysql/mysql/
417  client_authentication.h
418  client_plugin.h
419  client_plugin.h.pp
420  com_data.h
421  get_password.h
422  group_replication_priv.h
423  innodb_priv.h
424  mysql_lex_string.h
425  plugin.h
426  plugin_audit.h
427  plugin_audit.h.pp
428  plugin_auth.h
429  plugin_auth.h.pp
430  plugin_auth_common.h
431  plugin_ftparser.h
432  plugin_ftparser.h.pp
433  plugin_group_replication.h
434  plugin_keyring.h
435  plugin_keyring.h.pp
436  plugin_trace.h
437  plugin_validate_password.h
438  service_command.h
439  service_locking.h
440  service_my_plugin_log.h
441  service_my_snprintf.h
442  service_mysql_alloc.h
443  service_mysql_keyring.h
444  service_mysql_password_policy.h
445  service_mysql_string.h
446  service_parser.h
447  service_rpl_transaction_ctx.h
448  service_rpl_transaction_write_set.h
449  service_rules_table.h
450  service_security_context.h
451  service_srv_session.h
452  service_srv_session_info.h
453  service_ssl_wrapper.h
454  service_thd_alloc.h
455  service_thd_engine_lock.h
456  service_thd_wait.h
457  service_thread_scheduler.h
458  services.h
459  services.h.pp
460  thread_pool_priv.h
461  thread_type.h
462 include/mysql/mysql/psi/
463  mysql_file.h
464  mysql_idle.h
465  mysql_mdl.h
466  mysql_memory.h
467  mysql_ps.h
468  mysql_socket.h
469  mysql_sp.h
470  mysql_stage.h
471  mysql_statement.h
472  mysql_table.h
473  mysql_thread.h
474  mysql_transaction.h
475  psi.h
476  psi_base.h
477  psi_memory.h
478 lib/mysql/
479  libmysqlclient.a
480  libmysqlclient.so
481  libmysqlclient.so.20
482 lib/pkgconfig/mysqlclient.pc
483 share/aclocal/mysql.m4
484 share/man/man1/
485  comp_err.1.gz
486  mysql.1.gz
487  mysql_config.1.gz
488  mysql_config_editor.1.gz
489  mysqladmin.1.gz
490  mysqlbinlog.1.gz
491  mysqlcheck.1.gz
492  mysqldump.1.gz
493  mysqlimport.1.gz
494  mysqlpump.1.gz
495  mysqlshow.1.gz
496  mysqlslap.1.gz
497
498
499 [FILE:1333:patches/patch-CMakeLists.txt]
500 --- CMakeLists.txt.orig 2020-09-23 12:00:04 UTC
501 +++ CMakeLists.txt
502 @@ -633,6 +633,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
503  ENDIF()
504  
505  # Check for pthread_getthreadid_np()
506 +set(CMAKE_REQUIRED_LIBRARIES pthread)
507  CHECK_C_SOURCE_COMPILES("
508  #include <pthread_np.h>
509  int main(int ac, char **av)
510 @@ -641,6 +642,7 @@ int main(int ac, char **av)
511    return (tid != 0 ? 0 : 1);
512  }"
513  HAVE_PTHREAD_GETTHREADID_NP)
514 +set(CMAKE_REQUIRED_LIBRARIES "")
515  
516  # Check for pthread_self() returning an integer type
517  CHECK_C_SOURCE_COMPILES("
518 @@ -733,7 +735,6 @@ IF(NOT WITHOUT_SERVER)
519    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
520    IF(WITH_EMBEDDED_SERVER) 
521     ADD_SUBDIRECTORY(libmysqld)
522 -   ADD_SUBDIRECTORY(libmysqld/examples)
523    ENDIF(WITH_EMBEDDED_SERVER)
524  ENDIF()
525  
526 @@ -794,7 +795,6 @@ ELSE()
527    SET(CPACK_GENERATOR "TGZ")
528  ENDIF() 
529  ADD_SUBDIRECTORY(packaging/WiX)
530 -ADD_SUBDIRECTORY(packaging/solaris)
531  
532  IF(UNIX)
533    INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
534 @@ -802,6 +802,7 @@ ENDIF()
535  #
536  # RPM installs documentation directly from the source tree
537  #
538 +IF(FALSE)
539  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
540    INSTALL(FILES
541      README
542 @@ -822,6 +823,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
543      PATTERN "sp-imp-spec.txt" EXCLUDE
544    )
545  ENDIF()
546 +ENDIF()
547  
548  INCLUDE(CPack)
549  
550
551
552 [FILE:1177:patches/patch-cmake_os_SunOS.cmake]
553 $NetBSD: patch-cmake_os_SunOS.cmake,v 1.3 2019/10/31 12:04:22 jperkin Exp $
554
555 Do not attempt to detect ISA, it conflicts with wrappers.
556 Disable HAVE_SOLARIS_LARGE_PAGES, only supported on Oracle Solaris.
557
558 --- cmake/os/SunOS.cmake.orig   2020-09-23 12:00:04 UTC
559 +++ cmake/os/SunOS.cmake
560 @@ -77,6 +77,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
561  # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html
562  ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS)
563  
564 +IF (0)
565  IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
566    EXECUTE_PROCESS(COMMAND isainfo -b
567      OUTPUT_VARIABLE ISAINFO_B
568 @@ -101,6 +102,7 @@ ELSE()
569      SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64")
570    ENDIF()
571  ENDIF()
572 +ENDIF()
573  
574  # On  Solaris, use of intrinsics will screw the lib search logic
575  # Force using -lm, so rint etc are found.
576 @@ -111,7 +113,7 @@ SET(LIBM m)
577  SET(CMAKE_THREAD_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
578  
579  # Solaris specific large page support
580 -CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_SOLARIS_LARGE_PAGES)
581 +#CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_SOLARIS_LARGE_PAGES)
582  
583  # Solaris atomics
584  CHECK_C_SOURCE_RUNS(
585
586
587 [FILE:584:patches/patch-cmake_plugin.cmake]
588 --- cmake/plugin.cmake.orig     2020-09-23 12:00:04 UTC
589 +++ cmake/plugin.cmake
590 @@ -278,9 +278,6 @@ MACRO(MYSQL_ADD_PLUGIN)
591        MYSQL_INSTALL_TARGETS(${target}
592          DESTINATION ${INSTALL_PLUGINDIR}
593          COMPONENT ${INSTALL_COMPONENT})
594 -      INSTALL_DEBUG_TARGET(${target}
595 -        DESTINATION ${INSTALL_PLUGINDIR}/debug
596 -        COMPONENT ${INSTALL_COMPONENT})
597        # Add installed files to list for RPMs
598        FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
599                "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
600
601
602 [FILE:677:patches/patch-cmake_ssl.cmake]
603 --- cmake/ssl.cmake.orig        2020-09-23 12:00:04 UTC
604 +++ cmake/ssl.cmake
605 @@ -193,17 +193,10 @@ MACRO (MYSQL_CHECK_SSL)
606        )
607      SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
608  
609 -    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
610 -       ADD_DEFINITIONS(-DHAVE_TLSv13)
611 -       SET(HAVE_TLSv13 1)
612 -       IF(SOLARIS)
613 -         SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
614 -       ENDIF()
615 -    ENDIF()
616      IF(OPENSSL_INCLUDE_DIR AND
617         OPENSSL_LIBRARY   AND
618         CRYPTO_LIBRARY      AND
619 -       OPENSSL_MAJOR_VERSION STREQUAL "1"
620 +       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
621        )
622        SET(OPENSSL_FOUND TRUE)
623      ELSE()
624
625
626 [FILE:491:patches/patch-include_my__compare.h]
627 --- include/my_compare.h.orig   2020-09-23 12:00:04 UTC
628 +++ include/my_compare.h
629 @@ -47,7 +47,7 @@ extern "C" {
630    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
631  */
632  
633 -#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
634 +#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
635  #define HA_MAX_KEY_SEG              16          /* Max segments for key */
636  
637  #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
638
639
640 [FILE:419:patches/patch-include_my__thread__os__id.h]
641 --- include/my_thread_os_id.h.orig      2020-09-23 12:00:04 UTC
642 +++ include/my_thread_os_id.h
643 @@ -88,8 +88,12 @@ static inline my_thread_os_id_t my_threa
644    return pthread_getthreadid_np();
645  #else
646  #ifdef HAVE_INTEGER_PTHREAD_SELF
647 +#  ifdef __DragonFly__
648 +  return syscall(SYS_lwp_gettid);
649 +#  else
650    /* Unknown platform, fallback. */
651    return pthread_self();
652 +#  endif
653  #else
654    /* Feature not available. */
655    return 0;
656
657
658 [FILE:549:patches/patch-include_myisam.h]
659 --- include/myisam.h.orig       2020-09-23 12:00:04 UTC
660 +++ include/myisam.h
661 @@ -52,7 +52,7 @@ extern "C" {
662    The following defines can be increased if necessary.
663    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
664  */
665 -#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
666 +#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
667  #define MI_MAX_KEY_SEG              16              /* Max segments for key */
668  
669  #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
670
671
672 [FILE:459:patches/patch-libmysql_CMakeLists.txt]
673 --- libmysql/CMakeLists.txt.orig        2020-09-23 12:00:04 UTC
674 +++ libmysql/CMakeLists.txt
675 @@ -316,7 +316,7 @@ IF(NOT DISABLE_SHARED)
676    TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
677    IF(UNIX)
678      # libtool compatability
679 -    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
680 +    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly|Linux|SunOS" OR APPLE)
681        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
682      ELSE()
683        SET(OS_SHARED_LIB_VERSION
684
685
686 [FILE:334:patches/patch-libservices_CMakeLists.txt]
687 --- libservices/CMakeLists.txt.orig     2020-09-23 12:00:04 UTC
688 +++ libservices/CMakeLists.txt
689 @@ -47,4 +47,6 @@ SET(MYSQLSERVICES_SOURCES
690    mysql_keyring_service.c)
691  
692  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
693 +IF(FALSE)
694  INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
695 +ENDIF()
696
697
698 [FILE:1910:patches/patch-mysys__ssl_my__default.cc]
699 --- mysys_ssl/my_default.cc.orig        2020-09-23 12:00:04 UTC
700 +++ mysys_ssl/my_default.cc
701 @@ -126,7 +126,7 @@ static my_bool defaults_already_read= FA
702  
703  /* Which directories are searched for options (and in which order) */
704  
705 -#define MAX_DEFAULT_DIRS 6
706 +#define MAX_DEFAULT_DIRS 7
707  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
708  static const char **default_directories = NULL;
709  
710 @@ -930,6 +930,14 @@ static int search_default_file_with_ext(
711        return 1;                                 /* Ignore wrong files */
712    }
713  
714 +  if (strstr(name, "/etc") == name)
715 +  {
716 +    fprintf(stderr,
717 +             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
718 +             name,name);
719 +      goto err;
720 +  }
721 +
722    while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
723    {
724      line++;
725 @@ -1268,7 +1276,8 @@ void my_print_default_files(const char *
726              end[(strlen(end)-1)] = ' ';
727            else
728              strxmov(end, conf_file, *ext , " ",  NullS);
729 -          fputs(name, stdout);
730 +          if (strstr(name, "/etc") != name)
731 +            fputs(name, stdout);
732          }
733        }
734      }
735 @@ -1427,13 +1436,8 @@ static const char **init_default_directo
736  
737  #else
738  
739 -  errors += add_directory(alloc, "/etc/", dirs);
740 -  errors += add_directory(alloc, "/etc/mysql/", dirs);
741 -
742 -#if defined(DEFAULT_SYSCONFDIR)
743 -  if (DEFAULT_SYSCONFDIR[0])
744 -    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
745 -#endif /* DEFAULT_SYSCONFDIR */
746 +  errors += add_directory(alloc, "/usr/local/etc/", dirs);
747 +  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
748  
749  #endif
750  
751 @@ -1504,7 +1508,7 @@ int check_file_permissions(const char *f
752    MY_STAT stat_info;
753  
754    if (!my_stat(file_name,&stat_info,MYF(0)))
755 -    return 1;
756 +    return 0;
757    /*
758      Ignore .mylogin.cnf file if not exclusively readable/writable
759      by current user.
760
761
762 [FILE:430:patches/patch-plugin_password__validation_validate__password.cc]
763 --- plugin/password_validation/validate_password.cc.orig        2020-09-23 12:00:04 UTC
764 +++ plugin/password_validation/validate_password.cc
765 @@ -25,6 +25,8 @@
766  #include <mysql/plugin_validate_password.h>
767  #include <mysql/service_my_plugin_log.h>
768  #include <mysql/service_mysql_string.h>
769 +/* solve clash between libc++ bitset::test() and test macro from my_global.h */
770 +#undef test
771  #include <set>
772  #include <iostream>
773  #include <fstream>
774
775
776 [FILE:678:patches/patch-rapid_plugin_x_mysqlx__configure.cmake]
777 --- rapid/plugin/x/mysqlx_configure.cmake.orig  2020-09-23 12:00:04 UTC
778 +++ rapid/plugin/x/mysqlx_configure.cmake
779 @@ -42,6 +42,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
780  CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
781                 ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
782  
783 +IF(FALSE)
784  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
785          DESTINATION ${INSTALL_INCLUDEDIR}
786          COMPONENT Developement)
787 @@ -53,3 +54,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
788  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
789          DESTINATION ${INSTALL_INCLUDEDIR}
790          COMPONENT Developement)
791 +ENDIF()
792
793
794 [FILE:547:patches/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt]
795 --- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig    2020-09-23 12:00:04 UTC
796 +++ rapid/unittest/gunit/xplugin/CMakeLists.txt
797 @@ -78,7 +78,6 @@ ADD_DEFINITIONS(
798  )
799  
800  INCLUDE_DIRECTORIES(SYSTEM
801 -    ${BOOST_INCLUDE_DIR}
802      ${PROTOBUF_INCLUDE_DIRS}
803      ${SSL_INCLUDE_DIRS}
804      ${LIBEVENT_INCLUDE_DIRS}
805 @@ -88,6 +87,7 @@ INCLUDE_DIRECTORIES(SYSTEM
806  )
807  
808  INCLUDE_DIRECTORIES(
809 +  ${BOOST_INCLUDE_DIR}
810    ${CMAKE_SOURCE_DIR}/testing/include
811    ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
812    ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
813
814
815 [FILE:342:patches/patch-regex_CMakeLists.txt]
816 --- regex/CMakeLists.txt.orig   2020-09-23 12:00:04 UTC
817 +++ regex/CMakeLists.txt
818 @@ -21,6 +21,7 @@
819  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
820  
821  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
822 +INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
823  
824  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
825  
826
827
828 [FILE:1680:patches/patch-scripts_CMakeLists.txt]
829 --- scripts/CMakeLists.txt.orig 2020-09-23 12:00:04 UTC
830 +++ scripts/CMakeLists.txt
831 @@ -240,13 +240,9 @@ IF(NOT FIND_PROC AND CMAKE_SYSTEM_NAME M
832      "ps -p $PID | grep -v mysqld_safe | grep -- $MYSQLD > /dev/null")
833  ENDIF()
834  
835 -IF(NOT FIND_PROC)
836 -  # BSD styl
837 -  EXECUTE_PROCESS(COMMAND ps -uaxww OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result)
838 -  IF(result MATCHES 0) 
839 +IF(NOT FIND_PROC AND CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
840       SET( FIND_PROC
841         "ps -uaxww | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
842 -  ENDIF()
843  ENDIF()
844  
845  IF(NOT FIND_PROC)
846 @@ -293,7 +289,7 @@ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR
847  SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
848  SET(localstatedir ${MYSQL_DATADIR})
849  
850 -IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
851 +IF(TRUE)
852    SET(RPATH_OPTION " -R$pkglibdir")
853  ENDIF()
854  
855 @@ -330,6 +326,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
856            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
857            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
858            SET(${var} "${${var}}-l${lib} " )
859 +        ELSEIF(lib STREQUAL "-pthread")
860 +          SET(${var} "${${var}}-pthread " )
861          ELSE()
862            SET(${var} "${${var}}-l${lib} " )
863          ENDIF()
864 @@ -456,7 +454,7 @@ ELSE()
865    FOREACH(file ${BIN_SCRIPTS})
866      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
867        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
868 -        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
869 +        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
870      ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
871        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
872           ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
873
874
875 [FILE:275:patches/patch-sql_CMakeLists.txt]
876 --- sql/CMakeLists.txt.orig     2020-09-23 12:00:04 UTC
877 +++ sql/CMakeLists.txt
878 @@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES(
879    ${CMAKE_SOURCE_DIR}/regex 
880    ${SSL_INCLUDE_DIRS}
881    ${CMAKE_BINARY_DIR}/sql
882 +  ${CMAKE_BINARY_DIR}/include
883 +  ${CMAKE_BINARY_DIR}
884    ${LZ4_INCLUDE_DIR}
885  )
886  
887
888
889 [FILE:1264:patches/patch-sql_conn__handler_socket__connection.cc]
890 --- sql/conn_handler/socket_connection.cc.orig  2020-09-23 12:00:04 UTC
891 +++ sql/conn_handler/socket_connection.cc
892 @@ -950,22 +950,25 @@ Channel_info* Mysqld_socket_listener::li
893      signal(SIGCHLD, SIG_DFL);
894      request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
895                   mysql_socket_getfd(connect_sock), NULL);
896 -    fromhost(&req);
897 +    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
898 +    my_fromhost(&req);
899  
900 -    if (!hosts_access(&req))
901 +    int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
902 +    if (!my_hosts_access(&req))
903      {
904        /*
905          This may be stupid but refuse() includes an exit(0)
906          which we surely don't want...
907          clean_exit() - same stupid thing ...
908        */
909 +      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
910        syslog(LOG_AUTH | m_deny_severity,
911 -             "refused connect from %s", eval_client(&req));
912 +             "refused connect from %s", my_eval_client(&req));
913  
914  #ifdef HAVE_LIBWRAP_PROTOTYPES
915        // Some distros have patched tcpd.h to have proper prototypes
916        if (req.sink)
917 -        (req.sink)(req.fd);
918 +        ((void (*)(int)) (req.sink))(req.fd);
919  #else
920        // Some distros have not patched tcpd.h
921        if (req.sink)
922
923
924 [FILE:381:patches/patch-sql_mysqld.cc]
925 --- sql/mysqld.cc.orig  2020-09-23 12:00:04 UTC
926 +++ sql/mysqld.cc
927 @@ -3423,7 +3423,7 @@ int warn_self_signed_ca()
928  static int init_ssl()
929  {
930  #ifdef HAVE_OPENSSL
931 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
932 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
933    CRYPTO_malloc_init();
934  #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
935    OPENSSL_malloc_init();
936
937
938 [FILE:2575:patches/patch-sql_sql__view.cc]
939 --- sql/sql_view.cc.orig        2020-09-23 12:00:04 UTC
940 +++ sql/sql_view.cc
941 @@ -785,46 +785,46 @@ static const int required_view_parameter
942  */
943  static File_option view_parameters[]=
944  {{{ C_STRING_WITH_LEN("query")},
945 -  my_offsetof(TABLE_LIST, select_stmt),
946 +  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
947    FILE_OPTIONS_ESTRING},
948   {{ C_STRING_WITH_LEN("md5")},
949 -  my_offsetof(TABLE_LIST, md5),
950 +  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
951    FILE_OPTIONS_STRING},
952   {{ C_STRING_WITH_LEN("updatable")},
953 -  my_offsetof(TABLE_LIST, updatable_view),
954 +  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
955    FILE_OPTIONS_ULONGLONG},
956   {{ C_STRING_WITH_LEN("algorithm")},
957 -  my_offsetof(TABLE_LIST, algorithm),
958 +  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
959    FILE_OPTIONS_ULONGLONG},
960   {{ C_STRING_WITH_LEN("definer_user")},
961 -  my_offsetof(TABLE_LIST, definer.user),
962 +  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
963    FILE_OPTIONS_STRING},
964   {{ C_STRING_WITH_LEN("definer_host")},
965 -  my_offsetof(TABLE_LIST, definer.host),
966 +  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
967    FILE_OPTIONS_STRING},
968   {{ C_STRING_WITH_LEN("suid")},
969 -  my_offsetof(TABLE_LIST, view_suid),
970 +  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
971    FILE_OPTIONS_ULONGLONG},
972   {{ C_STRING_WITH_LEN("with_check_option")},
973 -  my_offsetof(TABLE_LIST, with_check),
974 +  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
975    FILE_OPTIONS_ULONGLONG},
976   {{ C_STRING_WITH_LEN("timestamp")},
977 -  my_offsetof(TABLE_LIST, timestamp),
978 +  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
979    FILE_OPTIONS_TIMESTAMP},
980   {{ C_STRING_WITH_LEN("create-version")},
981 -  my_offsetof(TABLE_LIST, file_version),
982 +  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
983    FILE_OPTIONS_ULONGLONG},
984   {{ C_STRING_WITH_LEN("source")},
985 -  my_offsetof(TABLE_LIST, source),
986 +  static_cast<int>(my_offsetof(TABLE_LIST, source)),
987    FILE_OPTIONS_ESTRING},
988   {{(char*) STRING_WITH_LEN("client_cs_name")},
989 -  my_offsetof(TABLE_LIST, view_client_cs_name),
990 +  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
991    FILE_OPTIONS_STRING},
992   {{(char*) STRING_WITH_LEN("connection_cl_name")},
993 -  my_offsetof(TABLE_LIST, view_connection_cl_name),
994 +  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
995    FILE_OPTIONS_STRING},
996   {{(char*) STRING_WITH_LEN("view_body_utf8")},
997 -  my_offsetof(TABLE_LIST, view_body_utf8),
998 +  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
999    FILE_OPTIONS_ESTRING},
1000   {{NullS, 0},                  0,
1001    FILE_OPTIONS_STRING}
1002
1003
1004 [FILE:1921:patches/patch-sql_sys__vars.cc]
1005 --- sql/sys_vars.cc.orig        2020-09-23 12:00:04 UTC
1006 +++ sql/sys_vars.cc
1007 @@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_tim
1008         "connection before closing it",
1009         SESSION_VAR(net_interactive_timeout),
1010         CMD_LINE(REQUIRED_ARG),
1011 -       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
1012 +       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
1013  
1014  static Sys_var_ulong Sys_join_buffer_size(
1015         "join_buffer_size",
1016 @@ -2628,7 +2628,7 @@ static Sys_var_ulong Sys_net_read_timeou
1017         "Number of seconds to wait for more data from a connection before "
1018         "aborting the read",
1019         SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
1020 -       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
1021 +       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
1022         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
1023         ON_UPDATE(fix_net_read_timeout));
1024  
1025 @@ -2652,7 +2652,7 @@ static Sys_var_ulong Sys_net_write_timeo
1026         "Number of seconds to wait for a block to be written to a connection "
1027         "before aborting the write",
1028         SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
1029 -       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
1030 +       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
1031         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
1032         ON_UPDATE(fix_net_write_timeout));
1033  
1034 @@ -4378,7 +4378,7 @@ static Sys_var_ulong Sys_net_wait_timeou
1035         "The number of seconds the server waits for activity on a "
1036         "connection before closing it",
1037         SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
1038 -       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
1039 +       VALID_RANGE(1, INT_MAX32/1000),
1040         DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
1041  
1042  static Sys_var_plugin Sys_default_storage_engine(
1043
1044
1045 [FILE:440:patches/patch-storage_innobase_include_srv0mon.h]
1046 --- storage/innobase/include/srv0mon.h.orig     2020-09-23 12:00:04 UTC
1047 +++ storage/innobase/include/srv0mon.h
1048 @@ -41,6 +41,10 @@ Created 12/15/2009   Jimmy Yang
1049  /* Required for FreeBSD so that INT64_MAX is defined. */
1050  #define __STDC_LIMIT_MACROS
1051  #endif /* __STDC_LIMIT_MACROS */
1052 +#ifdef __DragonFly__
1053 +/* The hack above doen't work for dragonfly, stdint.h already imported */
1054 +#include <machine/int_limits.h>
1055 +#endif
1056  
1057  #include <stdint.h>
1058  
1059
1060
1061 [FILE:985:patches/patch-storage_myisam_mi__dynrec.c]
1062 --- storage/myisam/mi_dynrec.c.orig     2020-09-23 12:00:04 UTC
1063 +++ storage/myisam/mi_dynrec.c
1064 @@ -72,18 +72,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
1065      DBUG_RETURN(1);
1066    }
1067    /*
1068 -    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
1069 -    MAP_NORESERVE
1070 -      Do not reserve swap space for this mapping. When swap space is
1071 -      reserved, one has the guarantee that it is possible to modify the
1072 -      mapping. When swap space is not reserved one might get SIGSEGV
1073 -      upon a write if no physical memory is available.
1074 +    MAP_NORESERVE is unimplemented in FreeBSD
1075    */
1076    info->s->file_map= (uchar*)
1077                    my_mmap(0, (size_t) size,
1078                            info->s->mode==O_RDONLY ? PROT_READ :
1079                            PROT_READ | PROT_WRITE,
1080 -                          MAP_SHARED | MAP_NORESERVE,
1081 +                          MAP_SHARED,
1082                            info->dfile, 0L);
1083    if (info->s->file_map == (uchar*) MAP_FAILED)
1084    {
1085
1086
1087 [FILE:2182:files/my.cnf.sample.in]
1088 [client]
1089 port                            = 3306
1090 socket                          = /tmp/mysql.sock
1091
1092 [mysql]
1093 prompt                          = \u@\h [\d]>\_
1094 no_auto_rehash
1095
1096 [mysqld]
1097 user                            = mysql
1098 port                            = 3306
1099 socket                          = /tmp/mysql.sock
1100 bind-address                    = 127.0.0.1
1101 basedir                         = %%PREFIX%%
1102 datadir                         = %%MY_DBDIR%%
1103 tmpdir                          = %%MY_TMPDIR%%
1104 slave-load-tmpdir               = %%MY_TMPDIR%%
1105 secure-file-priv                = %%MY_SECDIR%%
1106 log-bin                         = mysql-bin
1107 log-output                      = TABLE
1108 master-info-repository          = TABLE
1109 relay-log-info-repository       = TABLE
1110 relay-log-recovery              = 1
1111 slow-query-log                  = 1
1112 server-id                       = 1
1113 sync_binlog                     = 1
1114 sync_relay_log                  = 1
1115 binlog_cache_size               = 16M
1116 expire_logs_days                = 30
1117 default_password_lifetime       = 0
1118 enforce-gtid-consistency        = 1
1119 gtid-mode                       = ON
1120 safe-user-create                = 1
1121 lower_case_table_names          = 1
1122 explicit-defaults-for-timestamp = 1
1123 myisam-recover-options          = BACKUP,FORCE
1124 open_files_limit                = 32768
1125 table_open_cache                = 16384
1126 table_definition_cache          = 8192
1127 net_retry_count                 = 16384
1128 key_buffer_size                 = 256M
1129 max_allowed_packet              = 64M
1130 query_cache_type                = 0
1131 query_cache_size                = 0
1132 long_query_time                 = 0.5
1133 innodb_buffer_pool_size         = 1G
1134 innodb_data_home_dir            = %%MY_DBDIR%%
1135 innodb_log_group_home_dir       = %%MY_DBDIR%%
1136 innodb_data_file_path           = ibdata1:128M:autoextend
1137 innodb_temp_data_file_path      = ibtmp1:128M:autoextend
1138 innodb_flush_method             = O_DIRECT
1139 innodb_log_file_size            = 256M
1140 innodb_log_buffer_size          = 16M
1141 innodb_write_io_threads         = 8
1142 innodb_read_io_threads          = 8
1143 innodb_autoinc_lock_mode        = 2
1144 skip-symbolic-links
1145
1146 [mysqldump]
1147 max_allowed_packet              = 256M
1148 quote_names
1149 quick
1150
1151
1152 [FILE:2478:files/mysql-server.in]
1153 #!/bin/sh
1154 #
1155 # PROVIDE: mysql
1156 # REQUIRE: LOGIN
1157 # KEYWORD: shutdown
1158
1159 #
1160 # Add the following line to /etc/rc.conf to enable mysql:
1161 # mysql_enable (bool):  Set to "NO" by default.
1162 #                       Set it to "YES" to enable MySQL.
1163 # mysql_limits (bool):  Set to "NO" by default.
1164 #                       Set it to yes to run `limits -e -U mysql`
1165 #                       just before mysql starts.
1166 # mysql_dbdir (str):    Default to "%%MY_DBDIR%%"
1167 #                       Base database directory.
1168 # mysql_confdir (str):  Default to "%%ETCDIR%%"
1169 #                       Base configuration directory.
1170 # mysql_optfile (str):  Server-specific option file.
1171 #                       Set it in the rc.conf or default behaviour of
1172 #                       `mysqld_safe` itself, will be picking
1173 #                       ${mysql_confdir}/my.cnf if it exists.
1174 # mysql_pidfile (str):  Custum PID file path and name.
1175 #                       Default to "${mysql_dbdir}/${hostname}.pid".
1176 # mysql_args (str):     Custom additional arguments to be passed
1177 #                       to mysqld_safe (default empty).
1178 #
1179
1180 . /etc/rc.subr
1181
1182 name="mysql"
1183 rcvar=mysql_enable
1184
1185 load_rc_config $name
1186
1187 : ${mysql_enable="NO"}
1188 : ${mysql_limits="NO"}
1189 : ${mysql_dbdir="%%MY_DBDIR%%"}
1190 : ${mysql_confdir="%%ETCDIR%%"}
1191 if [ -f "${mysql_confdir}/my.cnf" ]; then
1192 : ${mysql_optfile="${mysql_confdir}/my.cnf"}
1193 elif [ -f "${mysql_dbdir}/my.cnf" ]; then
1194 : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
1195 fi
1196 if [ ! -z "${mysql_optfile}" ]; then
1197 mysql_extra="--defaults-extra-file=${mysql_optfile}"
1198 fi
1199
1200 mysql_user="mysql"
1201 mysql_limits_args="-e -U ${mysql_user}"
1202 : ${hostname:=`/bin/hostname`}
1203 pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
1204 command="/usr/sbin/daemon"
1205 command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
1206 procname="%%PREFIX%%/libexec/mysqld"
1207 start_precmd="${name}_prestart"
1208 start_postcmd="${name}_poststart"
1209 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
1210 mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}"
1211
1212 mysql_create_auth_tables()
1213 {
1214         eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
1215 }
1216
1217 mysql_prestart()
1218 {
1219         if [ ! -d "${mysql_dbdir}/mysql/." ]; then
1220                 mysql_create_auth_tables || return 1
1221         fi
1222         if checkyesno mysql_limits; then
1223                 eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
1224         else
1225                 return 0
1226         fi
1227 }
1228
1229 mysql_poststart()
1230 {
1231         local timeout=15
1232         while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
1233                 timeout=$(( timeout - 1 ))
1234                 sleep 1
1235         done
1236         return 0
1237 }
1238
1239 run_rc_command "$1"
1240
1241
1242 [FILE:576:files/pkg-message-server.in]
1243 *****************************************************************************
1244
1245 Remember to run mysql_upgrade the first time you start the MySQL server
1246 after an upgrade from an earlier version.
1247
1248 Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
1249 ie. when you want to use "mysql -u root -p" first you should see password
1250 in /root/.mysql_secret
1251
1252 MySQL57 has a default %%ETCDIR%%/my.cnf,
1253 remember to replace it wit your own
1254 or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
1255
1256 *****************************************************************************
1257
1258
1259 [FILE:28:files/special.mk]
1260 ETCDIR= ${PREFIX}/etc/mysql
1261