bucket_68/mysql57

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