diff options
| author | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
| commit | ce145789092b294a562f565671478ae2bf51d14a (patch) | |
| tree | 927515d304bd661aebdb0e534418caf49d322ada /support-files | |
| parent | 0c6a0b9a3118948efeedefd036d2994982babd08 (diff) | |
| parent | efb134f3a874befe4ab1779f597ada09f57ca191 (diff) | |
| download | mariadb-git-ce145789092b294a562f565671478ae2bf51d14a.tar.gz | |
Merge with 4.0.18
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/MySQL-shared-compat.spec.sh | 4 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 8 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 11 |
3 files changed, 19 insertions, 4 deletions
diff --git a/support-files/MySQL-shared-compat.spec.sh b/support-files/MySQL-shared-compat.spec.sh index 06dfec1f6f9..2a257a601a1 100644 --- a/support-files/MySQL-shared-compat.spec.sh +++ b/support-files/MySQL-shared-compat.spec.sh @@ -42,8 +42,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: MySQL-shared, mysql-shared Provides: MySQL-shared Summary: MySQL shared libraries for MySQL %{version4} and %{version3} -Source0: MySQL-shared-%{version4}-0.i386.rpm -Source1: MySQL-shared-%{version3}-1.i386.rpm +Source0: MySQL-shared-%{version4}-0.%{_arch}.rpm +Source1: MySQL-shared-%{version3}-1.%{_arch}.rpm # No need to include the RPMs once more - they can be downloaded seperately # if you want to rebuild this package NoSource: 0 diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 5911ecd942b..849f913bf6c 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -59,6 +59,12 @@ export PATH mode=$1 # start or stop +case `echo "testing\c"`,`echo -n testing` in + *c*,-n*) echo_n= echo_c= ;; + *c*,*) echo_n=-n echo_c= ;; + *) echo_n= echo_c='\c' ;; +esac + parse_arguments() { for arg do case "$arg" in @@ -169,7 +175,7 @@ case "$mode" in sleep 1 while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ] do - [ -z "$flags" ] && echo "Wait for mysqld to exit\c" || echo ".\c" + [ -z "$flags" ] && echo $echo_n "Wait for mysqld to exit$echo_c" || echo $echo_n ".$echo_c" flags=a$flags sleep 1 done diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 1ee88096def..ee5bc77c636 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -469,6 +469,7 @@ fi %attr(755, root, root) %{_bindir}/isamlog %attr(755, root, root) %{_bindir}/my_print_defaults %attr(755, root, root) %{_bindir}/myisamchk +%attr(755, root, root) %{_bindir}/myisam_ftdump %attr(755, root, root) %{_bindir}/myisamlog %attr(755, root, root) %{_bindir}/myisampack %attr(755, root, root) %{_bindir}/mysql_convert_table_format @@ -496,7 +497,7 @@ fi %attr(755, root, root) %{_sbindir}/rcmysql %attr(644, root, root) %{_libdir}/mysql/mysqld.sym -%attr(644, root, root) %{_sysconfdir}/logrotate.d/mysql +%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql %attr(755, root, root) %{_sysconfdir}/init.d/mysql %attr(755, root, root) %{_datadir}/mysql/ @@ -575,10 +576,18 @@ fi # The spec file changelog only includes changes made to the spec file # itself %changelog +* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com> + +- 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) + * Fri Dec 13 2003 Lenz Grimmer <lenz@mysql.com> - fixed file permissions (BUG 1672) |