diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/binary-configure.sh | 2 | ||||
| -rwxr-xr-x | support-files/build-tags | 9 | ||||
| -rw-r--r-- | support-files/mysql-max.spec.sh | 4 | ||||
| -rw-r--r-- | support-files/mysql-multi.server.sh | 8 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 8 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 35 |
6 files changed, 49 insertions, 17 deletions
diff --git a/support-files/binary-configure.sh b/support-files/binary-configure.sh index 682ea570b25..107f468bffc 100644 --- a/support-files/binary-configure.sh +++ b/support-files/binary-configure.sh @@ -20,5 +20,5 @@ then echo "Starting the mysqld server. You can test that it is up and running" echo "with the command:" echo "./bin/mysqladmin version" - ./bin/safe_mysqld & + ./bin/mysqld_safe & fi diff --git a/support-files/build-tags b/support-files/build-tags new file mode 100755 index 00000000000..d5f9fbf5100 --- /dev/null +++ b/support-files/build-tags @@ -0,0 +1,9 @@ +#! /bin/sh + +rm -f TAGS +filter='\.cc$\|\.c$\|\.h$\|\.yy$' +files=`bk -r sfiles -gU | grep $filter ` +for f in $files ; +do + etags -o TAGS --append $f +done diff --git a/support-files/mysql-max.spec.sh b/support-files/mysql-max.spec.sh index 49f131154c0..5c4b16f0e9d 100644 --- a/support-files/mysql-max.spec.sh +++ b/support-files/mysql-max.spec.sh @@ -208,7 +208,7 @@ chmod -R og-rw $mysql_datadir/mysql # Restart in the same way that mysqld will be started normally. /etc/rc.d/init.d/mysql start -# Allow safe_mysqld to start mysqld and print a message before we exit +# Allow mysqld_safe to start mysqld and print a message before we exit sleep 2 %preun @@ -244,7 +244,7 @@ fi %attr(755, root, root) /usr/bin/perror %attr(755, root, root) /usr/bin/replace %attr(755, root, root) /usr/bin/resolveip -%attr(755, root, root) /usr/bin/safe_mysqld +%attr(755, root, root) /usr/bin/mysqld_safe %attr(755, root, root) /usr/bin/mysqld_multi %attr(755, root, root) /usr/bin/my_print_defaults diff --git a/support-files/mysql-multi.server.sh b/support-files/mysql-multi.server.sh index 6c940630427..31020029354 100644 --- a/support-files/mysql-multi.server.sh +++ b/support-files/mysql-multi.server.sh @@ -133,14 +133,14 @@ case "$mode" in 'start') # Start daemon - if test -x $bindir/safe_mysqld + if test -x $bindir/mysqld_safe then # We only need to specify datadir and pid-file here and we # get all other instance-specific config from $datadir/my.cnf. # We have to explicitly pass --defaults-extra-file because it # reads the config files before the command line options. - # Also it must be first because of the way safe_mysqld works. - $bindir/safe_mysqld --defaults-extra-file=$datadir/my.cnf \ + # Also it must be first because of the way mysqld_safe works. + $bindir/mysqld_safe --defaults-extra-file=$datadir/my.cnf \ --datadir=$datadir --pid-file=$pid_file & # Make lock for RedHat / SuSE if test -d /var/lock/subsys @@ -148,7 +148,7 @@ case "$mode" in touch /var/lock/subsys/mysql fi else - echo "Can't execute $bindir/safe_mysqld" + echo "Can't execute $bindir/mysqld_safe" fi ;; diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 62381ccf0d3..eed749bf5b2 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -100,25 +100,25 @@ case "$mode" in 'start') # Start daemon - if test -x $bindir/safe_mysqld + if test -x $bindir/mysqld_safe then # Give extra arguments to mysqld with the my.cnf file. This script may # be overwritten at next upgrade. - $bindir/safe_mysqld --datadir=$datadir --pid-file=$pid_file & + $bindir/mysqld_safe --datadir=$datadir --pid-file=$pid_file & # Make lock for RedHat / SuSE if test -w /var/lock/subsys then touch /var/lock/subsys/mysql fi else - echo "Can't execute $bindir/safe_mysqld" + echo "Can't execute $bindir/mysqld_safe" fi ;; 'stop') # Stop daemon. We use a signal here to avoid having to know the # root password. - if test -f "$pid_file" + if test -s "$pid_file" then mysqld_pid=`cat $pid_file` echo "Killing mysqld with pid $mysqld_pid" diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 81ee0c52eea..604e067087b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1,6 +1,6 @@ %define mysql_version @VERSION@ %define shared_lib_version @SHARED_LIB_VERSION@ -%define release 1 +%define release 2 %define mysqld_user mysql %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com @@ -143,6 +143,20 @@ Optional MySQL server binary that supports features like transactional tables. To active this binary, just install this package after the MySQL package. +%package embedded +Release: %{release} +Requires: devel +Summary: MySQL - embedded library +Group: Applications/Databases +Summary(pt_BR): MySQL - Medições de desempenho +Group(pt_BR): Aplicações/Banco_de_Dados +Obsoletes: embedded + +%description embedded +This package contains the MySQL server as library. + +%{see_base} + %prep %setup -n mysql-%{mysql_version} @@ -177,6 +191,8 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ --infodir=/usr/info \ --includedir=/usr/include \ --mandir=/usr/man \ + --with-embedded-server \ + --enable-thread-safe-client \ --with-comment=\"Official MySQL RPM\"; # Add this for more debugging support # --with-debug @@ -195,7 +211,7 @@ RBR=$RPM_BUILD_ROOT MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} if test -z "$RBR" -o "$RBR" = "/" then - echo "RPM_BUILD_ROOT has insecure value" + echo "RPM_BUILD_ROOT has stupid value" exit 1 fi rm -rf $RBR @@ -361,11 +377,12 @@ fi %attr(755, root, root) /usr/bin/mysqlbug %attr(755, root, root) /usr/bin/mysqltest %attr(755, root, root) /usr/bin/mysqlhotcopy +%attr(755, root, root) /usr/bin/mysql_explain_log %attr(755, root, root) /usr/bin/perror %attr(755, root, root) /usr/bin/replace %attr(755, root, root) /usr/bin/resolveip +%attr(755, root, root) /usr/bin/mysqld_safe %attr(755, root, root) /usr/bin/resolve_stack_dump -%attr(755, root, root) /usr/bin/safe_mysqld %attr(755, root, root) /usr/bin/mysqld_multi %attr(755, root, root) /usr/bin/my_print_defaults @@ -403,7 +420,7 @@ fi %attr(644, root, man) %doc /usr/man/man1/mysqlshow.1* %attr(644, root, man) %doc /usr/man/man1/perror.1* %attr(644, root, man) %doc /usr/man/man1/replace.1* -%attr(644, root, man) %doc /usr/man/man1/safe_mysqld.1* +%attr(644, root, man) %doc /usr/man/man1/mysqld_safe.1* %post shared /sbin/ldconfig @@ -424,16 +441,22 @@ fi %files bench %attr(-, root, root) /usr/share/sql-bench %attr(-, root, root) /usr/share/mysql-test +%attr(755, root, root) /usr/bin/mysqlmanager +%attr(755, root, root) /usr/bin/mysqlmanager-pwgen +%attr(755, root, root) /usr/bin/mysqlmanagerc %files Max %attr(755, root, root) /usr/sbin/mysqld-max %attr(644, root, root) /usr/lib/mysql/mysqld-max.sym +%files embedded +%attr(755, root, root) /usr/lib/mysql/libmysqld.a + %changelog -* Fri Feb 15 2002 Sasha +* Mon Oct 8 2001 Monty -- changed build to use --with-other-libc +- Added embedded server as a separate RPM * Fri Apr 13 2001 Monty |