diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/MacOSX/postinstall.sh | 2 | ||||
| -rw-r--r-- | support-files/Makefile.am | 4 | ||||
| -rw-r--r-- | support-files/binary-configure.sh | 4 | ||||
| -rw-r--r-- | support-files/my-huge.cnf.sh | 4 | ||||
| -rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 12 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 4 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 4 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 4 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 19 |
10 files changed, 35 insertions, 24 deletions
diff --git a/support-files/MacOSX/postinstall.sh b/support-files/MacOSX/postinstall.sh index f46f4480e3e..ff921d3fee9 100644 --- a/support-files/MacOSX/postinstall.sh +++ b/support-files/MacOSX/postinstall.sh @@ -10,7 +10,7 @@ if cd @prefix@ ; then if [ ! -f data/mysql/db.frm ] ; then - ./scripts/mysql_install_db -IN-RPM + ./scripts/mysql_install_db --rpm fi if [ -d data ] ; then diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 79ba6eec763..196da3d8744 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -36,7 +36,6 @@ pkgdata_DATA = my-small.cnf \ my-huge.cnf \ mysql-log-rotate \ mysql-@VERSION@.spec \ - binary-configure \ MySQL-shared-compat.spec pkgdata_SCRIPTS = mysql.server @@ -51,7 +50,6 @@ CLEANFILES = my-small.cnf \ mysql.server \ binary-configure \ MySQL-shared-compat.spec - mysql-@VERSION@.spec: mysql.spec rm -f $@ @@ -101,5 +99,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/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 18e926b1400..ba92856df0e 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -10,8 +10,8 @@ # ~/.my.cnf to set user-specific options. # # One can in this file use all long options that the program supports. -# If you want to know which options a program support, run the program -# with --help option. +# If you want to know which options a program supports, run the program +# with the --help option. # The following options will be passed to all MySQL clients [client] diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index ed2c2ce9dfd..54df6a8bfe6 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -71,7 +71,7 @@ max_connections = 100 # the host will be blocked from connecting to the MySQL server until # "FLUSH HOSTS" has been run or the server was restarted. Invalid # passwords and other errors during the connect phase result in -# increasing this value. See the "Aborted_Connects" status variable for +# increasing this value. See the "Aborted_connects" status variable for # global counter. max_connect_errors = 10 @@ -111,14 +111,14 @@ max_heap_table_size = 64M # Sort buffer is used to perform sorts for some ORDER BY and GROUP BY # queries. If sorted data does not fit into the sort buffer, a disk -# based merge sort is used instead - See "sort_merge_passes". Allocated -# per thread if sort is needed. +# based merge sort is used instead - See the "Sort_merge_passes" +# status variable. Allocated per thread if sort is needed. sort_buffer_size = 8M # This buffer is used for the optimization of full JOINs (JOINs without # indexes). Such JOINs are very bad for performance in most cases # anyway, but setting this variable to a large value reduces the -# performance impact. See the "select_full_join" status variable for a +# performance impact. See the "Select_full_join" status variable for a # count of full JOINs. Allocated per thread if full join is found join_buffer_size = 8M @@ -317,7 +317,7 @@ key_buffer_size = 32M read_buffer_size = 2M # When reading rows in sorted order after a sort, the rows are read -# through this buffer to avoid a disk seeks. You can improve ORDER BY +# through this buffer to avoid disk seeks. You can improve ORDER BY # performance a lot, if set this to a high value. # Allocated per thread, when needed. read_rnd_buffer_size = 16M @@ -331,7 +331,7 @@ read_rnd_buffer_size = 16M bulk_insert_buffer_size = 64M # This buffer is allocated when MySQL needs to rebuild the index in -# REPAIR, OPTIMZE, ALTER table statements as well as in LOAD DATA INFILE +# REPAIR, OPTIMIZE, ALTER table statements as well as in LOAD DATA INFILE # into an empty table. It is allocated per thread so be careful with # large settings. myisam_sort_buffer_size = 128M diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 2b92dc61053..ba865a5bfd0 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -10,8 +10,8 @@ # ~/.my.cnf to set user-specific options. # # One can in this file use all long options that the program supports. -# If you want to know which options a program support, run the program -# with --help option. +# If you want to know which options a program supports, run the program +# with the --help option. # The following options will be passed to all MySQL clients [client] diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index bc13d7c0a61..4650ed06dc1 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -11,8 +11,8 @@ # ~/.my.cnf to set user-specific options. # # One can in this file use all long options that the program supports. -# If you want to know which options a program support, run the program -# with --help option. +# If you want to know which options a program supports, run the program +# with the --help option. # The following options will be passed to all MySQL clients [client] diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index 3c4cafa688f..ca26a10a397 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -11,8 +11,8 @@ # ~/.my.cnf to set user-specific options. # # One can in this file use all long options that the program supports. -# If you want to know which options a program support, run the program -# with --help option. +# If you want to know which options a program supports, run the program +# with the --help option. # The following options will be passed to all MySQL clients [client] diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 7f4987be3a8..849f913bf6c 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -125,7 +125,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` # # Set pid file if not given diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 714992e0826..8583b623392 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. @@ -221,7 +221,8 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --includedir=%{_includedir} \ --mandir=%{_mandir} \ --enable-thread-safe-client \ - --with-comment=\"Official MySQL RPM\"; + --with-comment=\"Official MySQL RPM\" \ + --with-readline ; # Add this for more debugging support # --with-debug # Add this for MyISAM RAID support: @@ -268,6 +269,7 @@ then fi BuildMySQL "--enable-shared \ + --with-openssl \ --with-berkeley-db \ --with-innodb \ --with-raid \ @@ -395,7 +397,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 @@ -473,6 +475,7 @@ fi %attr(755, root, root) %{_bindir}/myisamlog %attr(755, root, root) %{_bindir}/myisampack %attr(755, root, root) %{_bindir}/mysql_convert_table_format +%attr(755, root, root) %{_bindir}/mysql_create_system_tables %attr(755, root, root) %{_bindir}/mysql_explain_log %attr(755, root, root) %{_bindir}/mysql_fix_extensions %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables @@ -588,6 +591,10 @@ fi - added myisam_ftdump to the Server package +* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com> + +- link the mysql client against libreadline instead of libedit (BUG 2289) + * Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com> - marked /etc/logrotate.d/mysql as a config file (BUG 2156) @@ -600,6 +607,10 @@ fi - made testing for gcc3 a bit more robust +* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com> + +- added missing file mysql_create_system_tables to the server subpackage + * Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com> - removed dependency on MySQL-client from the MySQL-devel subpackage |