diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/Makefile.am | 5 | ||||
| -rw-r--r-- | support-files/binary-configure.sh | 4 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
4 files changed, 9 insertions, 9 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 79ba6eec763..58808b5e255 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -35,8 +35,6 @@ pkgdata_DATA = my-small.cnf \ my-large.cnf \ my-huge.cnf \ mysql-log-rotate \ - mysql-@VERSION@.spec \ - binary-configure \ MySQL-shared-compat.spec pkgdata_SCRIPTS = mysql.server @@ -51,7 +49,6 @@ CLEANFILES = my-small.cnf \ mysql.server \ binary-configure \ MySQL-shared-compat.spec - mysql-@VERSION@.spec: mysql.spec rm -f $@ @@ -101,5 +98,7 @@ SUFFIXES = .sh $< > $@-t @MV@ $@-t $@ +all: binary-configure + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/support-files/binary-configure.sh b/support-files/binary-configure.sh index 107f468bffc..884a8363e22 100644 --- a/support-files/binary-configure.sh +++ b/support-files/binary-configure.sh @@ -14,11 +14,11 @@ echo "and start the MySQL server for you. If you run into any trouble, please" echo "consult the MySQL manual, that you can find in the Docs directory." echo "" -./scripts/mysql_install_db +./scripts/mysql_install_db --no-defaults if [ $? = 0 ] then echo "Starting the mysqld server. You can test that it is up and running" echo "with the command:" echo "./bin/mysqladmin version" - ./bin/mysqld_safe & + ./bin/mysqld_safe --no-defaults & fi diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 694e6fa8ebb..ed973b61e57 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -129,7 +129,7 @@ then extra_args="-e $datadir/my.cnf" fi -parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server` +parse_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server` # Safeguard (relative paths, core dumps..) cd $basedir diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ffc74c7559d..661748adab9 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -149,7 +149,7 @@ languages and applications need to dynamically load and use MySQL. %package Max Release: %{release} -Summary: MySQL - server with Berkeley BD, RAID and UDF support +Summary: MySQL - server with Berkeley DB, OpenSSL, RAID and UDF support Group: Applications/Databases Provides: mysql-Max Obsoletes: mysql-Max @@ -157,7 +157,7 @@ Requires: MySQL >= 4.0 %description Max Optional MySQL server binary that supports additional features like -Berkeley DB, RAID and User Defined Functions (UDFs). +Berkeley DB, OpenSSL, RAID and User Defined Functions (UDFs). To activate this binary, just install this package in addition to the standard MySQL package. @@ -267,6 +267,7 @@ then fi BuildMySQL "--enable-shared \ + --with-openssl \ --with-berkeley-db \ --with-innodb \ --with-raid \ @@ -394,7 +395,7 @@ useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" mysql 2> /dev/nul chown -R mysql $mysql_datadir # Initiate databases -mysql_install_db -IN-RPM +mysql_install_db --rpm # Change permissions again to fix any new files. chown -R mysql $mysql_datadir |