[packages/mariadb] Drop dead TokuDB/NDB cruft, dead bconds and orphan patches
arekm
arekm at pld-linux.org
Tue May 26 17:04:19 CEST 2026
commit 1d8af985f58e16a153b7a6fc156a003146ffd9a0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue May 26 12:31:03 2026 +0200
Drop dead TokuDB/NDB cruft, dead bconds and orphan patches
mariadb-libevent.patch | 13 ----
mariadb.spec | 177 -----------------------------------------------
mysql-c++.patch | 12 ----
mysql-info.patch | 15 ----
mysql-ndb-cpc.init | 92 ------------------------
mysql-ndb-cpc.sysconfig | 2 -
mysql-ndb-mgm.init | 92 ------------------------
mysql-ndb-mgm.sysconfig | 2 -
mysql-ndb.init | 92 ------------------------
mysql-ndb.sysconfig | 2 -
mysql-noproc.patch | 33 ---------
mysql-system-users.patch | 34 ---------
12 files changed, 566 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 63df2f5..0594625 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,18 +1,12 @@
# TODO:
# - package not conflicting with mysql (or just easily replacing mysql)
-# - something wrong in //libmysql/CMakeLists.txt and thus symbols like
-# libmysqlclient.so.18(libmysqlclient_16) are missing
#
# Conditional build:
%bcond_without innodb # InnoDB storage engine support
%bcond_with galera # Galera replication support
-%bcond_without big_tables # Support tables with more than 4G rows even on 32 bit platforms
%bcond_with connect # Connect Storage Engine
-%bcond_without federated # Federated Storage Engine support
-%bcond_without raid # RAID support
%bcond_without ssl # OpenSSL support
%bcond_without tcpd # libwrap (tcp_wrappers) support
-%bcond_with tokudb # TokuDB engine support (available only for x86_64 ??)
%bcond_without mroonga # https://mariadb.com/kb/en/mariadb/about-mroonga/ (only for x86_64)
%bcond_without rocksdb # https://mariadb.com/kb/en/library/about-myrocks-for-mariadb/ (only for x86_64)
%bcond_with autodeps # BR packages needed only for resolving deps
@@ -21,10 +15,8 @@
%bcond_without cracklib # cracklib support
%bcond_without lz4 # lz4 page compression for InnoDB & XtraDB
%bcond_with tests # FIXME: don't run correctly
-%bcond_with ndb
%ifnarch %{x8664}
-%unglobal with_tokudb
%unglobal with_mroonga
%unglobal with_rocksdb
%endif
@@ -52,12 +44,6 @@ Source2: mariadb.sysconfig
Source3: mariadb.logrotate
Source4: mysqld.conf
Source5: mysql-clusters.conf
-Source7: mysql-ndb.init
-Source8: mysql-ndb.sysconfig
-Source9: mysql-ndb-mgm.init
-Source10: mysql-ndb-mgm.sysconfig
-Source11: mysql-ndb-cpc.init
-Source12: mysql-ndb-cpc.sysconfig
Source13: mysql-client.conf
Patch0: mysql-client-config.patch
Patch1: heimdal.patch
@@ -394,55 +380,6 @@ This package contains manual in HTML format.
%description doc -l pl.UTF-8
Podręcznik MariaDB-a w formacie HTML.
-%package ndb
-Summary: MariaDB - NDB Storage Engine Daemon
-Summary(pl.UTF-8): MariaDB - demon silnika przechowywania danych NDB
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb
-This package contains the standard MariaDB NDB Storage Engine Daemon.
-
-%description ndb -l pl.UTF-8
-Ten pakiet zawiera standardowego demona silnika przechowywania danych
-NDB.
-
-%package ndb-client
-Summary: MariaDB - NDB Clients
-Summary(pl.UTF-8): MariaDB - programy klienckie NDB
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb-client
-This package contains the standard MariaDB NDB Clients.
-
-%description ndb-client -l pl.UTF-8
-Ten pakiet zawiera standardowe programy klienckie MariaDB NDB.
-
-%package ndb-mgm
-Summary: MariaDB - NDB Management Daemon
-Summary(pl.UTF-8): MariaDB - demon zarządzający NDB
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb-mgm
-This package contains the standard MariaDB NDB Management Daemon.
-
-%description ndb-mgm -l pl.UTF-8
-Ten pakiet zawiera standardowego demona zarządzającego MariaDB NDB.
-
-%package ndb-cpc
-Summary: MariaDB - NDB CPC Daemon
-Summary(pl.UTF-8): MariaDB - demon NDB CPC
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb-cpc
-This package contains the standard MariaDB NDB CPC Daemon.
-
-%description ndb-cpc -l pl.UTF-8
-Ten pakiet zawiera standardowego demona MariaDB NDB CPC.
-
%package embedded
Summary: MariaDB as an embeddable library
Group: Applications/Databases
@@ -539,7 +476,6 @@ cd build
-DPLUGIN_OQGRAPH=%{?with_oqgraph:DYNAMIC}%{!?with_oqgraph:NO} \
-DPLUGIN_ROCKSDB=%{?with_rocksdb:DYNAMIC}%{!?with_rocksdb:NO} \
-DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
- -DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
-DPYTHON_SHEBANG=%{__python3} \
-DPYTHON_SHEBANG=%{python_path} \
-DSECURITY_HARDENED=ON \
@@ -600,16 +536,6 @@ touch $RPM_BUILD_ROOT/var/log/%{name}/{mysqld,query,slow}.log
cp -p mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf
cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf
-# NDB
-%if %{with ndb}
-install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb
-install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb-mgm
-cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-mgm
-install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb-cpc
-cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc
-%endif
-
sed -i -e 's,/usr//usr,%{_prefix},g' $RPM_BUILD_ROOT%{_bindir}/mysql_config
sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
@@ -710,36 +636,6 @@ if [ "$1" = "0" ]; then
%groupremove mysql
fi
-%post ndb
-/sbin/chkconfig --add mysql-ndb
-%service mysql-ndb restart "mysql NDB engine"
-
-%preun ndb
-if [ "$1" = "0" ]; then
- %service mysql-ndb stop
- /sbin/chkconfig --del mysql-ndb
-fi
-
-%post ndb-mgm
-/sbin/chkconfig --add mysql-ndb-mgm
-%service mysql-ndb-mgm restart "mysql NDB management node"
-
-%preun ndb-mgm
-if [ "$1" = "0" ]; then
- %service mysql-ndb-mgm stop
- /sbin/chkconfig --del mysql-ndb-mgm
-fi
-
-%post ndb-cpc
-/sbin/chkconfig --add mysql-ndb-cpc
-%service mysql-ndb-cpc restart "mysql NDB CPC"
-
-%preun ndb-cpc
-if [ "$1" = "0" ]; then
- %service mysql-ndb-cpc stop
- /sbin/chkconfig --del mysql-ndb-cpc
-fi
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -827,9 +723,6 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/plugin/wsrep_info.so
%endif
%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_example.so
-%if %{with tokudb}
-%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_tokudb.so
-%endif
%attr(755,root,root) %{_libdir}/%{name}/plugin/locales.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/metadata_lock_info.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/query_response_time.so
@@ -899,9 +792,6 @@ fi
%{_sysconfdir}/%{name}/conf.d/s3.cnf
%{_sysconfdir}/%{name}/conf.d/server.cnf
%{_sysconfdir}/%{name}/conf.d/spider.cnf
-%if %{with tokudb}
-#%{_sysconfdir}/%{name}/conf.d/tokudb.cnf
-%endif
%attr(755,root,root) %{_bindir}/mariadb-install-db
%attr(755,root,root) %{_bindir}/mariadb-plugin
%attr(755,root,root) %{_bindir}/mariadb-service-convert
@@ -979,9 +869,6 @@ fi
%attr(755,root,root) %{_bindir}/mysql_tzinfo_to_sql
%attr(755,root,root) %{_bindir}/perror
%attr(755,root,root) %{_bindir}/replace
-%if %{with tokudb}
-%attr(755,root,root) %{_bindir}/tokuftdump
-%endif
%{_mandir}/man1/mariadb-conv.1*
%{_mandir}/man1/mariadb-secure-installation.1*
%{_mandir}/man1/mariadb-tzinfo-to-sql.1*
@@ -1068,10 +955,6 @@ fi
%attr(751,root,root) %dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mysql-client.conf
%attr(755,root,root) %{_libdir}/libmariadb.so.3
-%if %{with ndb}
-%attr(755,root,root) %{_libdir}/libndbclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3
-%endif
%files devel
%defattr(644,root,root,755)
@@ -1104,66 +987,6 @@ fi
%{_mandir}/man1/mysqltest.1*
%{_mandir}/man1/mysqltest_embedded.1*
-%if %{with ndb}
-%files ndb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ndbd
-%attr(754,root,root) /etc/rc.d/init.d/mysql-ndb
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb
-#%{_mandir}/man1/ndbd.1*
-%{_mandir}/man1/ndbd_redo_log_reader.1*
-
-%files ndb-client
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ndb_config
-%attr(755,root,root) %{_bindir}/ndb_delete_all
-%attr(755,root,root) %{_bindir}/ndb_desc
-%attr(755,root,root) %{_bindir}/ndb_drop_index
-%attr(755,root,root) %{_bindir}/ndb_drop_table
-%attr(755,root,root) %{_bindir}/ndb_error_reporter
-%attr(755,root,root) %{_bindir}/ndb_mgm
-%attr(755,root,root) %{_bindir}/ndb_print_backup_file
-%attr(755,root,root) %{_bindir}/ndb_print_schema_file
-%attr(755,root,root) %{_bindir}/ndb_print_sys_file
-%attr(755,root,root) %{_bindir}/ndb_restore
-%attr(755,root,root) %{_bindir}/ndb_select_all
-%attr(755,root,root) %{_bindir}/ndb_select_count
-%attr(755,root,root) %{_bindir}/ndb_show_tables
-%attr(755,root,root) %{_bindir}/ndb_size.pl
-%attr(755,root,root) %{_bindir}/ndb_test_platform
-%attr(755,root,root) %{_bindir}/ndb_waiter
-%{_mandir}/man1/ndb_config.1*
-%{_mandir}/man1/ndb_delete_all.1*
-%{_mandir}/man1/ndb_desc.1*
-%{_mandir}/man1/ndb_drop_index.1*
-%{_mandir}/man1/ndb_drop_table.1*
-%{_mandir}/man1/ndb_error_reporter.1*
-%{_mandir}/man1/ndb_mgm.1*
-%{_mandir}/man1/ndb_print_backup_file.1*
-%{_mandir}/man1/ndb_print_schema_file.1*
-%{_mandir}/man1/ndb_print_sys_file.1*
-%{_mandir}/man1/ndb_restore.1*
-%{_mandir}/man1/ndb_select_all.1*
-%{_mandir}/man1/ndb_select_count.1*
-%{_mandir}/man1/ndb_show_tables.1*
-%{_mandir}/man1/ndb_size.pl.1*
-%{_mandir}/man1/ndb_waiter.1*
-
-%files ndb-mgm
-%defattr(644,root,root,755)
-#%attr(755,root,root) %{_sbindir}/ndb_mgmd
-%attr(754,root,root) /etc/rc.d/init.d/mysql-ndb-mgm
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-mgm
-#%{_mandir}/man1/ndb_mgmd.1*
-
-%files ndb-cpc
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ndb_cpcd
-%attr(754,root,root) /etc/rc.d/init.d/mysql-ndb-cpc
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-cpc
-%{_mandir}/man1/ndb_cpcd.1*
-%endif
-
%files embedded
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mariadb-client-test-embedded
diff --git a/mariadb-libevent.patch b/mariadb-libevent.patch
deleted file mode 100644
index 7ae5051..0000000
--- a/mariadb-libevent.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mariadb-5.1.41-rc/config/ac-macros/libevent.m4.org 2010-01-19 08:57:40.482393507 +0100
-+++ mariadb-5.1.41-rc/config/ac-macros/libevent.m4 2010-01-19 08:58:17.459054751 +0100
-@@ -12,8 +12,8 @@
- libevent_dir="libevent"
- AC_SUBST([libevent_dir])
-
-- libevent_libs="\$(top_builddir)/extra/libevent/libevent.a"
-- libevent_includes="-I\$(top_srcdir)/extra/libevent"
-+ libevent_libs="-levent"
-+ libevent_includes=""
- libevent_test_option="--mysqld=--thread-handling=pool-of-threads"
- AC_SUBST(libevent_libs)
- AC_SUBST(libevent_includes)
diff --git a/mysql-c++.patch b/mysql-c++.patch
deleted file mode 100644
index 2abe3d5..0000000
--- a/mysql-c++.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mysql-4.1.7.org/myisam/Makefile.am mysql-4.1.7/myisam/Makefile.am
---- mysql-4.1.7.org/myisam/Makefile.am 2004-10-27 01:35:55.000000000 +0200
-+++ mysql-4.1.7/myisam/Makefile.am 2004-10-27 01:41:47.764533080 +0200
-@@ -21,7 +21,7 @@
- LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
-- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-+ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ $(libdir)/libsupc++.la
- pkglib_LIBRARIES = libmyisam.a
- bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump
- myisamchk_DEPENDENCIES= $(LIBRARIES)
diff --git a/mysql-info.patch b/mysql-info.patch
deleted file mode 100644
index 179f823..0000000
--- a/mysql-info.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mysql-4.1.12/Docs/mysql.info~ 2005-05-16 08:05:46.000000000 +0300
-+++ mysql-4.1.12/Docs/mysql.info 2005-05-16 08:06:36.000000000 +0300
-@@ -1,8 +1,9 @@
- This is mysql.info, produced by makeinfo version 4.7 from manual.texi.
-
--START-INFO-DIR-ENTRY
--* mysql: (mysql). MySQL documentation.
--END-INFO-DIR-ENTRY
-+ at dircategory Data bases:
-+ at direntry
-+* mysql: (mysql). MySQL documentation
-+ at end direntry
-
-
- File: mysql.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
diff --git a/mysql-ndb-cpc.init b/mysql-ndb-cpc.init
deleted file mode 100644
index ad159b3..0000000
--- a/mysql-ndb-cpc.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# mysql-ndb-cpc This shell script takes care of starting and stopping mysql-ndb-cpc.
-#
-# chkconfig: 2345 80 30
-# description: mysql-ndb-cpc is a mysql NDB engine
-#
-# processname: ndbd
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb-cpc ]; then
- . /etc/sysconfig/mysql-ndb-cpc
-fi
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down mysql-ndb-cpc
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Start daemons.
- if [ ! -f /var/lock/subsys/mysql-ndb-cpc ]; then
- msg_starting "mysql ndb_cpcd"
- daemon ndb_cpcd $MYSQL_NDB_CPC_OPT
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb-cpc
- else
- msg_already_running "mysql ndb_cpcd"
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
- msg_stopping "mysql ndb_cpcd"
- killproc ndbd
- rm -f /var/lock/subsys/mysql-ndb-cpc >/dev/null 2>&1
- else
- msg_not_running "mysql ndb_cpcd"
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
- stop
- start
- else
- msg_not_running "mysql ndb_cpcd"
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status ndb_cpcd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/mysql-ndb-cpc.sysconfig b/mysql-ndb-cpc.sysconfig
deleted file mode 100644
index d6ad0c9..0000000
--- a/mysql-ndb-cpc.sysconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MYSQL_NDB_CPC_OPT=""
-SERVICE_RUN_NICE_LEVEL="+0"
diff --git a/mysql-ndb-mgm.init b/mysql-ndb-mgm.init
deleted file mode 100644
index 0f9681c..0000000
--- a/mysql-ndb-mgm.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# mysql-ndb-mgm This shell script takes care of starting and stopping mysql-ndb-mgm.
-#
-# chkconfig: 2345 80 30
-# description: mysql-ndb-mgm is a mysql NDB engine
-#
-# processname: ndbd
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb-mgm ]; then
- . /etc/sysconfig/mysql-ndb-mgm
-fi
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down mysql-ndb-mgm
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Start daemons.
- if [ ! -f /var/lock/subsys/mysql-ndb-mgm ]; then
- msg_starting "mysql ndb_mgmd"
- daemon ndb_mgmd $MYSQL_NDB_MGM_OPT
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb-mgm
- else
- msg_already_running "mysql ndb_mgmd"
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
- msg_stopping "mysql ndb_mgmd"
- killproc ndbd
- rm -f /var/lock/subsys/mysql-ndb-mgm >/dev/null 2>&1
- else
- msg_not_running "mysql ndb_mgmd"
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
- stop
- start
- else
- msg_not_running "mysql ndb_mgmd"
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status ndb_mgmd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/mysql-ndb-mgm.sysconfig b/mysql-ndb-mgm.sysconfig
deleted file mode 100644
index fc4936f..0000000
--- a/mysql-ndb-mgm.sysconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MYSQL_NDB_MGM_OPT=""
-SERVICE_RUN_NICE_LEVEL="+0"
diff --git a/mysql-ndb.init b/mysql-ndb.init
deleted file mode 100644
index 0374a48..0000000
--- a/mysql-ndb.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# mysql-ndb This shell script takes care of starting and stopping mysql-ndb.
-#
-# chkconfig: 2345 80 30
-# description: mysql-ndb is a mysql NDB engine
-#
-# processname: ndbd
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb ]; then
- . /etc/sysconfig/mysql-ndb
-fi
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down mysql-ndb
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Start daemons.
- if [ ! -f /var/lock/subsys/mysql-ndb ]; then
- msg_starting "mysql ndbd"
- daemon ndbd $MYSQL_NDB_OPT
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb
- else
- msg_already_running "mysql ndbd"
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/mysql-ndb ]; then
- msg_stopping "mysql ndbd"
- killproc ndbd
- rm -f /var/lock/subsys/mysql-ndb >/dev/null 2>&1
- else
- msg_not_running "mysql ndbd"
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/mysql-ndb ]; then
- stop
- start
- else
- msg_not_running "mysql ndbd"
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status ndbd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/mysql-ndb.sysconfig b/mysql-ndb.sysconfig
deleted file mode 100644
index 8b93682..0000000
--- a/mysql-ndb.sysconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MYSQL_NDB_OPT=""
-SERVICE_RUN_NICE_LEVEL="+0"
diff --git a/mysql-noproc.patch b/mysql-noproc.patch
deleted file mode 100644
index 90b7878..0000000
--- a/mysql-noproc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mysql-4.0.13/configure.in.orig Fri Jul 11 11:59:51 2003
-+++ mysql-4.0.13/configure.in Fri Jul 11 14:06:50 2003
-@@ -431,6 +431,7 @@
- # Lock for PS
- AC_PATH_PROG(PS, ps, ps)
- AC_MSG_CHECKING("how to check if pid exists")
-+if test -z "$FIND_PROC"; then
- PS=$ac_cv_path_PS
- # Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
-@@ -467,12 +468,14 @@
- AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
- esac
- fi
-+fi
- AC_SUBST(FIND_PROC)
- AC_MSG_RESULT("$FIND_PROC")
-
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)
- AC_MSG_CHECKING("for kill switches")
-+if test -z "$CHECK_PID"; then
- if $ac_cv_path_KILL -0 $$
- then
- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
-@@ -483,6 +486,7 @@
- AC_MSG_WARN([kill -0 to check for pid seems to fail])
- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
- fi
-+fi
- AC_SUBST(CHECK_PID)
- AC_MSG_RESULT("$CHECK_PID")
-
diff --git a/mysql-system-users.patch b/mysql-system-users.patch
deleted file mode 100644
index 9bdc823..0000000
--- a/mysql-system-users.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql
---- mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql 2007-09-24 12:29:43.000000000 +0200
-+++ mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql 2007-11-24 20:22:08.360937978 +0100
-@@ -7,23 +7,16 @@
- -- containing "@current_hostname" are filtered out by mysql_install_db.
- set @current_hostname= @@hostname;
-
--
---- Fill "db" table with default grants for anyone to
---- access database 'test' and 'test_%' if "db" table didn't exist
--CREATE TEMPORARY TABLE tmp_db LIKE db;
--INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
--INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
--INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
--DROP TABLE tmp_db;
--
--
- -- Fill "users" table with default users allowing root access
- -- from local machine if "users" table didn't exist before
- CREATE TEMPORARY TABLE tmp_user LIKE user;
- set @current_hostname= @@hostname;
--INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
--REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost';
--REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+INSERT INTO tmp_user VALUES ('localhost','mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+REPLACE INTO tmp_user SELECT @current_hostname,'mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost';
-+REPLACE INTO tmp_user VALUES ('127.0.0.1','mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+INSERT INTO tmp_user VALUES ('localhost','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
-+REPLACE INTO tmp_user SELECT @current_hostname,'mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost';
-+REPLACE INTO tmp_user VALUES ('127.0.0.1','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
- INSERT INTO tmp_user (host,user) VALUES ('localhost','');
- INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
- INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mariadb.git/commitdiff/cf4e68336946a41c69f75f229189fc18c3316b0e
More information about the pld-cvs-commit
mailing list