diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-05-20 08:31:37 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-05-20 08:31:37 +0000 |
| commit | c1d34f294df7880a5c4df220cf5152ed91202ce7 (patch) | |
| tree | f3ee142ae9577e75b83909764cf7546d5b8042ee /databases/mysql60-server/files | |
| parent | 7339636d9c936f4f8472b8f498d63b5338f4d0bd (diff) | |
| download | ports-c1d34f294df7880a5c4df220cf5152ed91202ce7.tar.gz ports-c1d34f294df7880a5c4df220cf5152ed91202ce7.zip | |
Notes
Diffstat (limited to 'databases/mysql60-server/files')
| -rw-r--r-- | databases/mysql60-server/files/mysql-server.sh.in | 2 | ||||
| -rw-r--r-- | databases/mysql60-server/files/patch-Makefile.in | 14 | ||||
| -rw-r--r-- | databases/mysql60-server/files/patch-scripts::Makefile.in | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/databases/mysql60-server/files/mysql-server.sh.in b/databases/mysql60-server/files/mysql-server.sh.in index 3b5439c44407..2caa4dc176e1 100644 --- a/databases/mysql60-server/files/mysql-server.sh.in +++ b/databases/mysql60-server/files/mysql-server.sh.in @@ -44,7 +44,7 @@ mysql_install_db_args="--ldata=${mysql_dbdir}" mysql_create_auth_tables() { - eval $mysql_install_db $mysql_install_db_args >/dev/null + eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} } diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index a8c65305f19f..dc92a178a9e8 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,18 +1,18 @@ ---- Makefile.in.orig Wed Dec 6 18:07:33 2006 -+++ Makefile.in Sun Dec 31 12:03:09 2006 -@@ -395,14 +395,7 @@ +--- Makefile.in.orig Tue May 8 11:43:16 2007 ++++ Makefile.in Thu May 17 09:28:15 2007 +@@ -396,14 +396,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ -- @readline_topdir@ sql-common \ +- @readline_topdir@ sql-common scripts \ - @thread_dirs@ pstack \ - @sql_union_dirs@ unittest storage plugin \ -- @sql_server@ scripts @man_dirs@ tests \ +- @sql_server@ @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files sql-bench @tools_dirs@ \ - win +SUBDIRS = - DIST_SUBDIRS = $(SUBDIRS) BUILD - + DIST_SUBDIRS = $(SUBDIRS) BUILD debian + DISTCLEANFILES = ac_available_languages_fragment diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in index 03f2e5e10008..7881ee6f48dc 100644 --- a/databases/mysql60-server/files/patch-scripts::Makefile.in +++ b/databases/mysql60-server/files/patch-scripts::Makefile.in @@ -1,9 +1,9 @@ ---- scripts/Makefile.in.orig Wed Apr 4 15:18:49 2007 -+++ scripts/Makefile.in Wed Apr 18 07:47:33 2007 -@@ -381,21 +381,7 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ +--- scripts/Makefile.in.orig Tue May 8 11:42:25 2007 ++++ scripts/Makefile.in Thu May 17 09:30:48 2007 +@@ -399,21 +399,7 @@ + BUILT_SOURCES = mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c + -bin_SCRIPTS = @server_scripts@ \ - msql2mysql \ - mysql_config \ @@ -23,9 +23,9 @@ noinst_SCRIPTS = make_binary_distribution \ make_sharedlib_distribution -@@ -425,11 +411,7 @@ - make_win_bin_dist \ - mysql_system_tables_fix.sql +@@ -445,11 +431,7 @@ + mysql_system_tables_fix.sql \ + CMakeLists.txt -dist_pkgdata_DATA = fill_help_tables.sql \ - mysql_fix_privilege_tables.sql \ |