diff options
Diffstat (limited to 'databases/mariadb-scripts/files')
6 files changed, 67 insertions, 100 deletions
diff --git a/databases/mariadb-scripts/files/mysql-server.in b/databases/mariadb-scripts/files/mysql-server.in deleted file mode 100644 index 37af2233ad55..000000000000 --- a/databases/mariadb-scripts/files/mysql-server.in +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. -# mysql_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. /etc/rc.subr - -name="mysql" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} - -mysql_user="mysql" -mysql_limits_args="-e -U ${mysql_user}" -pidfile="${mysql_dbdir}/`/bin/hostname`.pid" -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--ldata=${mysql_dbdir}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null - else - return 0 - fi -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb-scripts/files/patch-Makefile.in b/databases/mariadb-scripts/files/patch-Makefile.in new file mode 100644 index 000000000000..c60fbc44d875 --- /dev/null +++ b/databases/mariadb-scripts/files/patch-Makefile.in @@ -0,0 +1,18 @@ +--- Makefile.in.orig 2011-03-01 22:25:33.000000000 -0800 ++++ Makefile.in 2011-06-01 22:04:40.000000000 -0700 +@@ -476,14 +476,7 @@ + CMakeLists.txt \ + config/ac-macros/libevent_configure.m4 + +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ +- @readline_topdir@ sql-common scripts \ +- libservices \ +- @sql_union_dirs@ storage \ +- @sql_server@ @man_dirs@ tests \ +- netware @libmysqld_dirs@ \ +- mysql-test support-files sql-bench @tools_dirs@ \ +- win ++SUBDIRS = scripts @man_dirs@ + + DIST_SUBDIRS = . include Docs zlib \ + cmd-line-utils sql-common scripts \ diff --git a/databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp b/databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp deleted file mode 100644 index 22f981de5570..000000000000 --- a/databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- extra/yassl/src/yassl_error.cpp 2010-04-28 12:52:24 +0000 -+++ extra/yassl/src/yassl_error.cpp 2011-03-01 17:03:38 +0000 -@@ -128,7 +128,7 @@ - break; - - case badVersion_error : -- strncpy(buffer, "protocl version mismatch", max); -+ strncpy(buffer, "protocol version mismatch", max); - break; - - case compress_error : - - diff --git a/databases/mariadb-scripts/files/patch-man__Makefile.in b/databases/mariadb-scripts/files/patch-man__Makefile.in new file mode 100644 index 000000000000..5346b3739310 --- /dev/null +++ b/databases/mariadb-scripts/files/patch-man__Makefile.in @@ -0,0 +1,20 @@ +--- man/Makefile.in.orig 2011-03-01 22:25:06.000000000 -0800 ++++ man/Makefile.in 2011-06-01 22:55:49.000000000 -0700 +@@ -450,7 +450,7 @@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ + yassl_thread_cxxflags = @yassl_thread_cxxflags@ + zlib_dir = @zlib_dir@ +-man1_MANS = @man1_files@ ++man1_MANS = %%MANS%% + man8_MANS = @man8_files@ + EXTRA_DIST = $(man1_MANS) $(man8_MANS) + all: all-am +@@ -676,7 +676,7 @@ + + install-info: install-info-am + +-install-man: install-man1 install-man8 ++install-man: install-man1 + + installcheck-am: + diff --git a/databases/mariadb-scripts/files/patch-scripts__Makefile.in b/databases/mariadb-scripts/files/patch-scripts__Makefile.in new file mode 100644 index 000000000000..858aad6a1650 --- /dev/null +++ b/databases/mariadb-scripts/files/patch-scripts__Makefile.in @@ -0,0 +1,29 @@ +--- scripts/Makefile.in.orig 2011-03-01 22:25:08.000000000 -0800 ++++ scripts/Makefile.in 2011-06-01 22:13:44.000000000 -0700 +@@ -477,16 +477,12 @@ + BUILT_SOURCES = mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c + +-bin_SCRIPTS = @server_scripts@ \ +- msql2mysql \ +- mysql_config \ +- mysql_fix_privilege_tables \ ++bin_SCRIPTS = msql2mysql \ + mysql_fix_extensions \ + mysql_setpermission \ + mysql_secure_installation \ + mysql_zap \ + mysqlaccess \ +- mysqlbug \ + mysql_convert_table_format \ + mysql_find_rows \ + mysqlhotcopy \ +@@ -765,7 +761,7 @@ + uninstall: uninstall-am + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + + installcheck: installcheck-am + install-strip: diff --git a/databases/mariadb-scripts/files/patch-sql::mysqld.cc b/databases/mariadb-scripts/files/patch-sql::mysqld.cc deleted file mode 100644 index b3eb0311e544..000000000000 --- a/databases/mariadb-scripts/files/patch-sql::mysqld.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- sql/mysqld.cc 2011-02-28 17:39:30 +0000 -+++ sql/mysqld.cc 2011-03-04 10:39:27 +0000 -@@ -744,9 +744,7 @@ - /* Static variables */ - - static bool kill_in_progress, segfaulted; --#ifdef HAVE_STACKTRACE - static my_bool opt_stack_trace; --#endif /* HAVE_STACKTRACE */ - static my_bool opt_bootstrap, opt_myisam_log; - static int cleanup_done; - static ulong opt_specialflag, opt_myisam_block_size; - - |