Browse Source

Relocate mariadb to stx-integ/database/mariadb

Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: I10fbe52d9509b5aa7cc6cad75fdac01814ccc4a9
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
Scott Little 8 months ago
parent
commit
0287bfa207
42 changed files with 0 additions and 5601 deletions
  1. 0
    1
      centos_pkg_dirs
  2. 0
    6
      mariadb/centos/README
  3. 0
    4
      mariadb/centos/build_srpm.data
  4. 0
    27
      mariadb/centos/files/LICENSE.clustercheck
  5. 0
    13
      mariadb/centos/files/README.mysql-cnf
  6. 0
    4
      mariadb/centos/files/README.mysql-docs
  7. 0
    9
      mariadb/centos/files/README.mysql-license
  8. 0
    89
      mariadb/centos/files/clustercheck.sh
  9. 0
    31
      mariadb/centos/files/mariadb-admincrash.patch
  10. 0
    23
      mariadb/centos/files/mariadb-basedir.patch
  11. 0
    25
      mariadb/centos/files/mariadb-errno.patch
  12. 0
    71
      mariadb/centos/files/mariadb-example-config-files.patch
  13. 0
    49
      mariadb/centos/files/mariadb-file-contents.patch
  14. 0
    20
      mariadb/centos/files/mariadb-galera.cnf.patch
  15. 0
    48
      mariadb/centos/files/mariadb-install-db-sharedir.patch
  16. 0
    61
      mariadb/centos/files/mariadb-install-test.patch
  17. 0
    79
      mariadb/centos/files/mariadb-logrotate.patch
  18. 0
    23
      mariadb/centos/files/mariadb-notestdb.patch
  19. 0
    40
      mariadb/centos/files/mariadb-ownsetup.patch
  20. 0
    33
      mariadb/centos/files/mariadb-revert-stdouterr-closing.patch
  21. 0
    46
      mariadb/centos/files/mariadb-scripts.patch
  22. 0
    23
      mariadb/centos/files/mariadb-server-galera.te
  23. 0
    29
      mariadb/centos/files/mariadb-ssl-cypher.patch
  24. 0
    39
      mariadb/centos/files/mariadb-strmov.patch
  25. 0
    18
      mariadb/centos/files/my.cnf.in
  26. 0
    39
      mariadb/centos/files/mysql-check-socket.sh
  27. 0
    39
      mariadb/centos/files/mysql-check-upgrade.sh
  28. 0
    26
      mariadb/centos/files/mysql-embedded-check.c
  29. 0
    137
      mariadb/centos/files/mysql-prepare-db-dir.sh
  30. 0
    58
      mariadb/centos/files/mysql-scripts-common.sh
  31. 0
    45
      mariadb/centos/files/mysql-wait-ready.sh
  32. 0
    36
      mariadb/centos/files/mysql-wait-stop.sh
  33. 0
    186
      mariadb/centos/files/mysql.init.in
  34. 0
    70
      mariadb/centos/files/mysql.service.in
  35. 0
    3
      mariadb/centos/files/mysql.tmpfiles.d.in
  36. 0
    77
      mariadb/centos/files/mysql@.service.in
  37. 0
    26
      mariadb/centos/files/mysql_config_multilib.sh
  38. 0
    8
      mariadb/centos/files/rh-skipped-tests-arm.list
  39. 0
    9
      mariadb/centos/files/rh-skipped-tests-base.list
  40. 0
    0
      mariadb/centos/files/rh-skipped-tests-ppc-s390.list
  41. 0
    2033
      mariadb/centos/mariadb.spec
  42. 0
    1998
      mariadb/centos/mariadb.spec.unmodified

+ 0
- 1
centos_pkg_dirs View File

@@ -1,2 +1 @@
1 1
 iptables
2
-mariadb

+ 0
- 6
mariadb/centos/README View File

@@ -1,6 +0,0 @@
1
-The upstream mariadb includes TokuDB source code with AGPL license.
2
-As AGPL-3.0 is considered a prohibited license by WR, we've modified
3
-the source tarball to delete the storage/tokudb directory and remove
4
-the AGPL reference from the EXCEPTIONS-CLIENT Foss License file. The
5
-spec file has also been modified to compile without tokudb support.
6
-

+ 0
- 4
mariadb/centos/build_srpm.data View File

@@ -1,4 +0,0 @@
1
-COPY_LIST="$CGCS_BASE/downloads/mariadb-10.1.28.tar.gz $PKG_BASE/centos/files/*"
2
-TIS_PATCH_VER=15
3
-BUILD_IS_BIG=7
4
-BUILD_IS_SLOW=19

+ 0
- 27
mariadb/centos/files/LICENSE.clustercheck View File

@@ -1,27 +0,0 @@
1
-Copyright (c) 2012-2014, Olaf van Zandwijk
2
-All rights reserved.
3
-
4
-Redistribution and use in source and binary forms, with or without modification,
5
-are permitted provided that the following conditions are met:
6
-
7
-1. Redistributions of source code must retain the above copyright notice,
8
-   this list of conditions and the following disclaimer.
9
-
10
-2. Redistributions in binary form must reproduce the above copyright notice,
11
-   this list of conditions and the following disclaimer in the documentation
12
-   and/or other materials provided with the distribution.
13
-
14
-3. Neither the name of the copyright holder nor the names of its contributors
15
-   may be used to endorse or promote products derived from this software without
16
-   specific prior written permission.
17
-
18
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
22
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ 0
- 13
mariadb/centos/files/README.mysql-cnf View File

@@ -1,13 +0,0 @@
1
-This directory contains prepared configuration files with .cnf extension,
2
-which provide a configuration for some common MariaDB deployment scenarios.
3
-These configuration files do not include the default configuration of datadir,
4
-log-file and pid-file locations, as specified in the default my.cnf file,
5
-provided in this distribution.
6
-
7
-Thus, it is recommended to use these configuration files as an addition to the
8
-default my.cnf configuration file.
9
-
10
-Since default my.cnf contains `!includedir @INSTALL_SYSCONF2DIR@` directive, it is
11
-recommended to copy required configuration under @INSTALL_SYSCONF2DIR@ directory,
12
-so the default my.cnf specifications will be extended.
13
-

+ 0
- 4
mariadb/centos/files/README.mysql-docs View File

@@ -1,4 +0,0 @@
1
-The official MySQL documentation is not freely redistributable, so we cannot
2
-include it in RHEL or Fedora.  You can find it on-line at
3
-
4
-http://dev.mysql.com/doc/

+ 0
- 9
mariadb/centos/files/README.mysql-license View File

@@ -1,9 +0,0 @@
1
-MySQL is distributed under GPL v2, but there are some licensing exceptions
2
-that allow the client libraries to be linked with a non-GPL application,
3
-so long as the application is under a license approved by Oracle.
4
-For details see
5
-
6
-http://www.mysql.com/about/legal/licensing/foss-exception/
7
-
8
-Some innobase code from Percona and Google is under BSD license.
9
-Some code related to test-suite is under LGPLv2.

+ 0
- 89
mariadb/centos/files/clustercheck.sh View File

@@ -1,89 +0,0 @@
1
-#!/bin/bash
2
-#
3
-# Script to make a proxy (ie HAProxy) capable of monitoring Galera cluster nodes properly
4
-#
5
-# Author: Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
6
-# Author: Raghavendra Prabhu <raghavendra.prabhu@percona.com>
7
-# Author: Ryan O'Hara <rohara@redhat.com>
8
-#
9
-# Documentation and download: https://github.com/olafz/percona-clustercheck
10
-#
11
-# Based on the original script from Unai Rodriguez
12
-#
13
-
14
-if [ -f @INSTALL_SYSCONFDIR@/sysconfig/clustercheck ]; then
15
-    . @INSTALL_SYSCONFDIR@/sysconfig/clustercheck
16
-fi
17
-
18
-MYSQL_USERNAME="${MYSQL_USERNAME-clustercheckuser}"
19
-MYSQL_PASSWORD="${MYSQL_PASSWORD-clustercheckpassword!}"
20
-MYSQL_HOST="${MYSQL_HOST:-127.0.0.1}"
21
-MYSQL_PORT="${MYSQL_PORT:-3306}"
22
-ERR_FILE="${ERR_FILE:-/dev/null}"
23
-AVAILABLE_WHEN_DONOR=${AVAILABLE_WHEN_DONOR:-0}
24
-AVAILABLE_WHEN_READONLY=${AVAILABLE_WHEN_READONLY:-1}
25
-DEFAULTS_EXTRA_FILE=${DEFAULTS_EXTRA_FILE:-@INSTALL_SYSCONFDIR@/my.cnf}
26
-
27
-#Timeout exists for instances where mysqld may be hung
28
-TIMEOUT=10
29
-
30
-if [[ -r $DEFAULTS_EXTRA_FILE ]];then
31
-    MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE \
32
-                    --connect-timeout=$TIMEOUT \
33
-                    --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \
34
-                    --host=${MYSQL_HOST} --port=${MYSQL_PORT}"
35
-else
36
-    MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT \
37
-                    --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \
38
-                    --host=${MYSQL_HOST} --port=${MYSQL_PORT}"
39
-fi
40
-#
41
-# Perform the query to check the wsrep_local_state
42
-#
43
-WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \
44
-    2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
45
-
46
-if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]]
47
-then
48
-    # Check only when set to 0 to avoid latency in response.
49
-    if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
50
-        READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
51
-                    2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
52
-
53
-        if [[ "${READ_ONLY}" == "ON" ]];then
54
-            # Galera cluster node local state is 'Synced', but it is in
55
-            # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
56
-            # => return HTTP 503
57
-            # Shell return-code is 1
58
-            echo -en "HTTP/1.1 503 Service Unavailable\r\n"
59
-            echo -en "Content-Type: text/plain\r\n"
60
-            echo -en "Connection: close\r\n"
61
-            echo -en "Content-Length: 35\r\n"
62
-            echo -en "\r\n"
63
-            echo -en "Galera cluster node is read-only.\r\n"
64
-            sleep 0.1
65
-            exit 1
66
-        fi
67
-    fi
68
-    # Galera cluster node local state is 'Synced' => return HTTP 200
69
-    # Shell return-code is 0
70
-    echo -en "HTTP/1.1 200 OK\r\n"
71
-    echo -en "Content-Type: text/plain\r\n"
72
-    echo -en "Connection: close\r\n"
73
-    echo -en "Content-Length: 32\r\n"
74
-    echo -en "\r\n"
75
-    echo -en "Galera cluster node is synced.\r\n"
76
-    sleep 0.1
77
-    exit 0
78
-else
79
-    # Galera cluster node local state is not 'Synced' => return HTTP 503
80
-    # Shell return-code is 1
81
-    echo -en "HTTP/1.1 503 Service Unavailable\r\n"
82
-    echo -en "Content-Type: text/plain\r\n"
83
-    echo -en "Connection: close\r\n"
84
-    echo -en "Content-Length: 36\r\n"
85
-    echo -en "\r\n"
86
-    echo -en "Galera cluster node is not synced.\r\n"
87
-    sleep 0.1
88
-    exit 1
89
-fi

+ 0
- 31
mariadb/centos/files/mariadb-admincrash.patch View File

@@ -1,32 +0,0 @@
1
-mysqladmin crash on execution of below command:
2
-
3
-  #> mysqladmin -u root -p
4
-  ...
5
-  Segmentation fault (core dumped)
6
-
7
-This is probably caused by memory corruption based on working with temp_argv[-1].
8
-
9
-RHBZ: #1207041
10
-Upstream report: https://mariadb.atlassian.net/browse/MDEV-7883
11
-
12
----
13
- client/mysqladmin.cc | 3 ++-
14
- 1 file changed, 2 insertions(+), 1 deletion(-)
15
-
16
-diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
17
-index ffdc73f..cb0c558 100644
18
---- a/client/mysqladmin.cc
19
-+++ b/client/mysqladmin.cc
20
-@@ -1361,7 +1361,8 @@ static char **mask_password(int argc, char ***argv)
21
-      }
22
-     argc--;
23
-   }
24
--  temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
25
-+  if (argc >= 0)
26
-+    temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
27
-   return(temp_argv);
28
- }
29
- 
30
-1.9.1
31
-

+ 0
- 23
mariadb/centos/files/mariadb-basedir.patch View File

@@ -1,24 +0,0 @@
1
-Don't guess basedir in mysql_config; we place it under _libdir because
2
-of multilib conflicts, so use rather configured @prefix@ path directly.
3
-
4
----
5
- scripts/mysql_config.sh | 3 +--
6
- 1 file changed, 1 insertion(+), 2 deletions(-)
7
-
8
-diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
9
-index 52f6d56..df63365 100644
10
---- a/scripts/mysql_config.sh
11
-+++ b/scripts/mysql_config.sh
12
-@@ -76,8 +76,7 @@ get_full_path ()
13
- 
14
- me=`get_full_path $0`
15
- 
16
--# Script might have been renamed but assume mysql_<something>config<something>
17
--basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
18
-+basedir='@prefix@'
19
- 
20
- ldata='@localstatedir@'
21
- execdir='@libexecdir@'
22
-1.9.1
23
-

+ 0
- 25
mariadb/centos/files/mariadb-errno.patch View File

@@ -1,26 +0,0 @@
1
----
2
- include/my_sys.h | 8 +-------
3
- 1 file changed, 1 insertion(+), 7 deletions(-)
4
-
5
-diff --git a/include/my_sys.h b/include/my_sys.h
6
-index 110a2ee..a90ac5c 100644
7
---- a/include/my_sys.h
8
-+++ b/include/my_sys.h
9
-@@ -212,13 +212,7 @@
10
- #define my_safe_afree(ptr, size) my_afree(ptr)
11
- #endif /* HAVE_ALLOCA */
12
- 
13
--#ifndef errno				/* did we already get it? */
14
--#ifdef HAVE_ERRNO_AS_DEFINE
15
--#include <errno.h>			/* errno is a define */
16
--#else
17
--extern int errno;			/* declare errno */
18
--#endif
19
--#endif					/* #ifndef errno */
20
-+#include <errno.h>				/* errno is a define */
21
- extern char *home_dir;			/* Home directory for user */
22
- extern MYSQL_PLUGIN_IMPORT char  *mysql_data_home;
23
- extern const char *my_progname;		/* program-name (printed in errors) */
24
-1.9.1
25
-

+ 0
- 71
mariadb/centos/files/mariadb-example-config-files.patch View File

@@ -1,72 +0,0 @@
1
----
2
- support-files/my-huge.cnf.sh            | 1 +
3
- support-files/my-innodb-heavy-4G.cnf.sh | 2 +-
4
- support-files/my-large.cnf.sh           | 1 +
5
- support-files/my-medium.cnf.sh          | 1 +
6
- support-files/my-small.cnf.sh           | 1 +
7
- 5 files changed, 5 insertions(+), 1 deletion(-)
8
-
9
-diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
10
-index 4e08348..d8bf29e 100644
11
---- a/support-files/my-huge.cnf.sh
12
-+++ b/support-files/my-huge.cnf.sh
13
-@@ -25,6 +25,7 @@ socket		= @MYSQL_UNIX_ADDR@
14
- 
15
- # The MySQL server
16
- [mysqld]
17
-+log-error       = @LOG_LOCATION@
18
- port		= @MYSQL_TCP_PORT@
19
- socket		= @MYSQL_UNIX_ADDR@
20
- skip-external-locking
21
-diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
22
-index 2590ff5..85fd33a 100644
23
---- a/support-files/my-innodb-heavy-4G.cnf.sh
24
-+++ b/support-files/my-innodb-heavy-4G.cnf.sh
25
-@@ -42,7 +42,7 @@ socket		= @MYSQL_UNIX_ADDR@
26
- # The MariaDB server
27
- #
28
- [mysqld]
29
--
30
-+log-error	= @LOG_LOCATION@
31
- # generic configuration options
32
- port		= @MYSQL_TCP_PORT@
33
- socket		= @MYSQL_UNIX_ADDR@
34
-diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
35
-index 6f8dab0..e8c5f74 100644
36
---- a/support-files/my-large.cnf.sh
37
-+++ b/support-files/my-large.cnf.sh
38
-@@ -25,6 +25,7 @@ socket		= @MYSQL_UNIX_ADDR@
39
- 
40
- # The MariaDB server
41
- [mysqld]
42
-+log-error	= @LOG_LOCATION@
43
- port		= @MYSQL_TCP_PORT@
44
- socket		= @MYSQL_UNIX_ADDR@
45
- skip-external-locking
46
-diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
47
-index 19ab8df..fc8fc78 100644
48
---- a/support-files/my-medium.cnf.sh
49
-+++ b/support-files/my-medium.cnf.sh
50
-@@ -26,6 +26,7 @@ socket		= @MYSQL_UNIX_ADDR@
51
- 
52
- # The MariaDB server
53
- [mysqld]
54
-+log-error	= @LOG_LOCATION@
55
- port		= @MYSQL_TCP_PORT@
56
- socket		= @MYSQL_UNIX_ADDR@
57
- skip-external-locking
58
-diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
59
-index 8c78072..6777431 100644
60
---- a/support-files/my-small.cnf.sh
61
-+++ b/support-files/my-small.cnf.sh
62
-@@ -24,6 +24,7 @@ socket		= @MYSQL_UNIX_ADDR@
63
- 
64
- # The MySQL server
65
- [mysqld]
66
-+log-error	= @LOG_LOCATION@
67
- port		= @MYSQL_TCP_PORT@
68
- socket		= @MYSQL_UNIX_ADDR@
69
- skip-external-locking
70
-1.9.1
71
-

+ 0
- 49
mariadb/centos/files/mariadb-file-contents.patch View File

@@ -1,49 +0,0 @@
1
-Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
2
-breaks at least two packaging commandments, so we put them into $libdir
3
-instead.  That means we have to hack the file_contents regression test
4
-to know about this.
5
-
6
-Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
7
-
8
----
9
- mysql-test/t/file_contents.test   | 13 ++++++++++--
10
- 1 files changed, 11 insertions(+), 2 deletions(-)
11
-
12
-diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
13
-index 4734a02..a892297 100644
14
---- a/mysql-test/t/file_contents.test
15
-+++ b/mysql-test/t/file_contents.test
16
-@@ -11,7 +11,7 @@
17
- --perl
18
- print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
19
- $dir_bin = $ENV{'MYSQL_BINDIR'};
20
--if ($dir_bin eq '/usr/') {
21
-+if ($dir_bin =~ '.*/usr/$') {
22
-   # RPM package
23
-   $dir_docs = $dir_bin;
24
-   $dir_docs =~ s|/lib|/share/doc|;
25
-@@ -22,7 +22,7 @@ if ($dir_bin eq '/usr/') {
26
-     # RedHat: version number in directory name
27
-     $dir_docs = glob "$dir_docs/MariaDB-server*";
28
-   }
29
--} elsif ($dir_bin eq '/usr') {
30
-+} elsif ($dir_bin =~ '.*/usr$') {
31
-   # RPM build during development
32
-   $dir_docs = "$dir_bin/share/doc";
33
-   if(-d "$dir_docs/packages") {
34
-@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
35
-     # RedHat/Debian: version number in directory name
36
-     $dir_docs = glob "$dir_docs/mariadb-server-*";
37
-     $dir_docs = glob "$dir_docs/MariaDB-server*" unless -d $dir_docs;
38
-+
39
-+    # All the above is entirely wacko, because these files are not docs;
40
-+    # they should be kept in libdir instead.  mtr does not provide a nice
41
-+    # way to find libdir though, so we have to kluge it like this:
42
-+    if (-d "$dir_bin/lib64/mysql") {
43
-+       $dir_docs = "$dir_bin/lib64/mysql";
44
-+    } else {
45
-+       $dir_docs = "$dir_bin/lib/mysql";
46
-+    }
47
-   }
48
-   # Slackware
49
-   $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs;

+ 0
- 20
mariadb/centos/files/mariadb-galera.cnf.patch View File

@@ -1,21 +0,0 @@
1
----
2
- support-files/wsrep.cnf.sh | 3 +++
3
- 1 file changed, 3 insertions(+)
4
-
5
-diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh
6
-index a539085..51ce3dc 100644
7
---- a/support-files/wsrep.cnf.sh
8
-+++ b/support-files/wsrep.cnf.sh
9
-@@ -30,6 +30,9 @@ bind-address=0.0.0.0
10
- ## WSREP options
11
- ##
12
- 
13
-+# Enable wsrep
14
-+wsrep_on=1
15
-+
16
- # Full path to wsrep provider library or 'none'
17
- wsrep_provider=none
18
- 
19
-1.9.1
20
-

+ 0
- 48
mariadb/centos/files/mariadb-install-db-sharedir.patch View File

@@ -1,49 +0,0 @@
1
-Use configured value instead of hardcoded path
2
-
3
----
4
- scripts/mysql_install_db.pl.in | 2 +-
5
- scripts/mysql_install_db.sh    | 8 ++++----
6
- 2 files changed, 5 insertions(+), 5 deletions(-)
7
-
8
-diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
9
-index 9d2c1f6..0accdd1 100644
10
---- a/scripts/mysql_install_db.pl.in
11
-+++ b/scripts/mysql_install_db.pl.in
12
-@@ -320,7 +320,7 @@ elsif ( $opt->{basedir} )
13
-                     find_in_basedir($opt,"file","mysqld-nt",
14
-                                   "bin");  # ,"sql"
15
-   $srcpkgdatadir  = find_in_basedir($opt,"dir","fill_help_tables.sql",
16
--                                    "share","share/mysql");  # ,"scripts"
17
-+                                    "share","@INSTALL_MYSQLSHAREDIR@");  # ,"scripts"
18
-   $buildpkgdir    = $srcpkgdatadir;
19
-   $scriptdir      = "$opt->{basedir}/scripts";
20
- }
21
-diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
22
-index 364cc4f..eaa7a89 100644
23
---- a/scripts/mysql_install_db.sh
24
-+++ b/scripts/mysql_install_db.sh
25
-@@ -311,17 +311,17 @@ then
26
-     cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
27
-     exit 1
28
-   fi
29
--  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
30
-+  langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english`
31
-   if test -z "$langdir"
32
-   then
33
--    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
34
-+    cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english
35
-     exit 1
36
-   fi
37
--  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
38
-+  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
39
-   buildpkgdatadir=$srcpkgdatadir
40
-   if test -z "$srcpkgdatadir"
41
-   then
42
--    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
43
-+    cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@
44
-     exit 1
45
-   fi
46
-   scriptdir="$basedir/scripts"
47
-1.9.1
48
-

+ 0
- 61
mariadb/centos/files/mariadb-install-test.patch View File

@@ -1,62 +0,0 @@
1
-Improve the documentation that will be installed in the mysql-test RPM.
2
-
3
----
4
- mysql-test/README | 36 +++++++++++++++++++++++++-----------
5
- 1 file changed, 25 insertions(+), 11 deletions(-)
6
-
7
-diff --git a/mysql-test/README b/mysql-test/README
8
-index 0fba1cc..2e756e9 100644
9
---- a/mysql-test/README
10
-+++ b/mysql-test/README
11
-@@ -1,15 +1,28 @@
12
--This directory contains a test suite for the MySQL daemon. To run
13
--the currently existing test cases, simply execute ./mysql-test-run in
14
--this directory. It will fire up the newly built mysqld and test it.
15
-+This directory contains a test suite for the MariaDB daemon. To run
16
-+the currently existing test cases, execute ./mysql-test-run in
17
-+this directory.
18
- 
19
--Note that you do not have to have to do "make install", and you could
20
--actually have a co-existing MySQL installation. The tests will not
21
--conflict with it. To run the test suite in a source directory, you
22
--must do make first.
23
-+For use in Red Hat distributions, you should run the script as user mysql,
24
-+who is created with nologin shell however, so the best bet is something like
25
-+       $ su -
26
-+       # cd /usr/share/mysql-test
27
-+       # su -s /bin/bash mysql -c "./mysql-test-run --skip-test-list=rh-skipped-tests.list"
28
- 
29
--All tests must pass. If one or more of them fail on your system, please
30
--read the following manual section for instructions on how to report the
31
--problem:
32
-+This will use the installed mysql executables, but will run a private copy
33
-+of the server process (using data files within /usr/share/mysql-test),
34
-+so you need not start the mysqld service beforehand.
35
-+
36
-+The "--skip-test-list=rh-skipped-tests.list" option excludes tests that are
37
-+known to fail on one or more Red-Hat-supported platforms.  You can omit it
38
-+if you want to check whether such failures occur for you.  Documentation
39
-+about the reasons for omitting such tests can be found in the file
40
-+rh-skipped-tests.list.
41
-+
42
-+To clean up afterwards, remove the created "var" subdirectory, eg
43
-+       # su -s /bin/bash - mysql -c "rm -rf /usr/share/mysql-test/var"
44
-+
45
-+If one or more tests fail on your system, please read the following manual
46
-+section for instructions on how to report the problem:
47
- 
48
- https://mariadb.com/kb/en/reporting-bugs
49
- 
50
-@@ -26,7 +39,8 @@ other relevant options.
51
- 
52
- With no test cases named on the command line, mysql-test-run falls back
53
- to the normal "non-extern" behavior. The reason for this is that some
54
--tests cannot run with an external server.
55
-+tests cannot run with an external server (because they need to control the
56
-+options with which the server is started).
57
- 
58
- You can create your own test cases. To create a test case, create a new
59
- file in the t subdirectory using a text editor. The file should have a .test
60
-1.9.1
61
-

+ 0
- 79
mariadb/centos/files/mariadb-logrotate.patch View File

@@ -1,80 +0,0 @@
1
-Adjust the mysql-log-rotate script in several ways:
2
-
3
-* Use the correct log file pathname for Red Hat installations.
4
-* Enable creation of the log file by logrotate (needed since
5
-  /var/log/ isn't writable by mysql user); and set the same 640
6
-  permissions we normally use.
7
-* Comment out the actual rotation commands, so that user must edit
8
-  the file to enable rotation.  This is unfortunate, but the fact
9
-  that the script will probably fail without manual configuration
10
-  (to set a root password) means that we can't really have it turned
11
-  on by default.  Fortunately, in most configurations the log file
12
-  is low-volume and so rotation is not critical functionality.
13
-
14
-See discussions at RH bugs 799735, 547007
15
-
16
----
17
- support-files/mysql-log-rotate.sh | 44 ++++++++++++++++++++-------------------
18
- 1 files changed, 23 insertions(+), 21 deletions(-)
19
-
20
-diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh
21
-index 5d1b30b..425c591 100644
22
---- a/support-files/mysql-log-rotate.sh
23
-+++ b/support-files/mysql-log-rotate.sh
24
-@@ -1,9 +1,9 @@
25
- # This logname can be set in /etc/my.cnf
26
--# by setting the variable "err-log"
27
--# in the [safe_mysqld] section as follows:
28
-+# by setting the variable "log-error"
29
-+# in the [mysqld_safe] section as follows:
30
- #
31
--# [safe_mysqld]
32
--# err-log=@localstatedir@/mysqld.log
33
-+# [mysqld_safe]
34
-+# log-error=@LOG_LOCATION@
35
- #
36
- # If the root user has a password you have to create a
37
- # /root/.my.cnf configuration file with the following
38
-@@ -18,20 +18,22 @@
39
- # ATTENTION: This /root/.my.cnf should be readable ONLY
40
- # for root !
41
- 
42
--@localstatedir@/mysqld.log {
43
--        # create 600 mysql mysql
44
--        notifempty
45
--	daily
46
--        rotate 3
47
--        missingok
48
--        compress
49
--    postrotate
50
--	# just if mysqld is really running
51
--	if test -x @bindir@/mysqladmin && \
52
--	   @bindir@/mysqladmin ping &>/dev/null
53
--	then
54
--	   @bindir@/mysqladmin --local flush-error-log \
55
--              flush-engine-log flush-general-log flush-slow-log
56
--	fi
57
--    endscript
58
--}
59
-+# Then, un-comment the following lines to enable rotation of mysql's log file:
60
-+
61
-+#@LOG_LOCATION@ {
62
-+#        # create 600 mysql mysql
63
-+#        notifempty
64
-+#	daily
65
-+#        rotate 3
66
-+#        missingok
67
-+#        compress
68
-+#    postrotate
69
-+#	# just if mysqld is really running
70
-+#	if test -x @bindir@/mysqladmin && \
71
-+#	   @bindir@/mysqladmin ping &>/dev/null
72
-+#	then
73
-+#	   @bindir@/mysqladmin --local flush-error-log \
74
-+#              flush-engine-log flush-general-log flush-slow-log
75
-+#	fi
76
-+#    endscript
77
-+#}
78
-1.9.1
79
-

+ 0
- 23
mariadb/centos/files/mariadb-notestdb.patch View File

@@ -1,24 +0,0 @@
1
----
2
- scripts/mysql_install_db.pl.in | 4 ++--
3
- 1 file changed, 2 insertions(+), 2 deletions(-)
4
-
5
-diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
6
-index 0accdd1..3ab2786 100644
7
---- a/scripts/mysql_install_db.pl.in
8
-+++ b/scripts/mysql_install_db.pl.in
9
-@@ -399,10 +399,10 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
10
- }
11
- 
12
- # ----------------------------------------------------------------------
13
--# Create database directories mysql & test
14
-+# Create database directories mysql
15
- # ----------------------------------------------------------------------
16
- 
17
--foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
18
-+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql" )
19
- {
20
-   # FIXME not really the same as original "mkdir -p", but ok?
21
-   mkdir($dir, 0700) unless -d $dir;
22
-1.9.1
23
-

+ 0
- 40
mariadb/centos/files/mariadb-ownsetup.patch View File

@@ -1,41 +0,0 @@
1
----
2
- support-files/CMakeLists.txt | 1 +
3
- support-files/rpm/server.cnf | 9 +++++++++
4
- 2 files changed, 10 insertions(+)
5
-
6
-diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
7
-index 71e9b3f..5f3b2a6 100644
8
---- a/support-files/CMakeLists.txt
9
-+++ b/support-files/CMakeLists.txt
10
-@@ -81,6 +81,7 @@ IF(UNIX)
11
-   ENDIF()
12
- 
13
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
14
-+  CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
15
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
16
- 
17
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
18
-diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
19
-index 9682d2b..6f398d4 100644
20
---- a/support-files/rpm/server.cnf
21
-+++ b/support-files/rpm/server.cnf
22
-@@ -9,7 +9,16 @@
23
- [server]
24
- 
25
- # this is only for the mysqld standalone daemon
26
-+# Settings user and group are ignored when systemd is used.
27
-+# If you need to run mysqld under a different user or group,
28
-+# customize your systemd unit file for mysqld/mariadb according to the
29
-+# instructions in http://fedoraproject.org/wiki/Systemd
30
- [mysqld]
31
-+datadir=@MYSQL_DATADIR@
32
-+socket=@MYSQL_UNIX_ADDR@
33
-+log-error=@LOG_LOCATION@
34
-+pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid
35
-+
36
- 
37
- #
38
- # * Galera-related settings
39
-1.9.1
40
-

+ 0
- 33
mariadb/centos/files/mariadb-revert-stdouterr-closing.patch View File

@@ -1,34 +0,0 @@
1
----
2
- scripts/mysqld_safe.sh        | 2 +-
3
- support-files/mysql.server.sh | 2 +-
4
- 2 files changed, 2 insertions(+), 2 deletions(-)
5
-
6
-diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
7
-index 5564f92..fe77d97 100644
8
---- a/scripts/mysqld_safe.sh
9
-+++ b/scripts/mysqld_safe.sh
10
-@@ -756,7 +756,7 @@ if [ ! -d $mysql_unix_port_dir ]
11
- then
12
-   if ! `mkdir -p $mysql_unix_port_dir`
13
-   then
14
--    log_error "Fatal error Can't create database directory '$mysql_unix_port'"
15
-+    echo "Fatal error Can't create database directory '$mysql_unix_port'"
16
-     exit 1
17
-   fi
18
-   chown $user $mysql_unix_port_dir
19
-diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
20
-index ed0da3c..312f2b2 100644
21
---- a/support-files/mysql.server.sh
22
-+++ b/support-files/mysql.server.sh
23
-@@ -296,7 +296,7 @@ case "$mode" in
24
-     then
25
-       # Give extra arguments to mysqld with the my.cnf file. This script
26
-       # may be overwritten at next upgrade.
27
--      $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" &
28
-+      $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >dev/null &
29
-       wait_for_ready; return_value=$?
30
- 
31
-       # Make lock for RedHat / SuSE
32
-1.9.1
33
-

+ 0
- 46
mariadb/centos/files/mariadb-scripts.patch View File

@@ -1,47 +0,0 @@
1
----
2
- scripts/CMakeLists.txt | 29 +++++++++++++++++++++++++++++
3
- 1 file changed, 29 insertions(+)
4
-
5
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
6
-index 2f9c185..a6e4d49 100644
7
---- a/scripts/CMakeLists.txt
8
-+++ b/scripts/CMakeLists.txt
9
-@@ -362,6 +362,35 @@ ELSE()
10
-      )
11
-   ENDFOREACH()
12
- 
13
-+  # files for systemd
14
-+  SET(SYSTEMD_SCRIPTS
15
-+    mysql.tmpfiles.d
16
-+    mysql.service
17
-+    mysql@.service
18
-+    mysql-prepare-db-dir
19
-+    mysql-wait-ready
20
-+    mysql-wait-stop
21
-+    mysql-check-socket
22
-+    mysql-check-upgrade
23
-+    mysql-scripts-common
24
-+    mysql_config_multilib
25
-+    clustercheck
26
-+    mysql.init
27
-+    my.cnf
28
-+  )
29
-+  FOREACH(file ${SYSTEMD_SCRIPTS})
30
-+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31
-+      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
32
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
33
-+    ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in)
34
-+      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.in
35
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
36
-+    ELSE()
37
-+      MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file}.in in "
38
-+        "${CMAKE_CURRENT_SOURCE_DIR}" )
39
-+    ENDIF()
40
-+  ENDFOREACH()
41
-+
42
-   FOREACH(file ${WSREP_SOURCE})
43
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
44
-       ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
45
-1.9.1
46
-

+ 0
- 23
mariadb/centos/files/mariadb-server-galera.te View File

@@ -1,23 +0,0 @@
1
-
2
-module mariadb-server-galera 1.0;
3
-
4
-require {
5
-    type mysqld_t;
6
-    type rsync_exec_t;
7
-    type anon_inodefs_t;
8
-    type proc_net_t;
9
-    type kerberos_port_t;
10
-    class file { read execute execute_no_trans getattr open };
11
-    class tcp_socket { name_bind name_connect };
12
-    class process { setpgid siginh rlimitinh noatsecure };
13
-}
14
-
15
-# allow mysqld to run rsyncd
16
-allow mysqld_t self:process setpgid;
17
-allow mysqld_t rsync_exec_t:file { read execute execute_no_trans getattr open };
18
-allow mysqld_t anon_inodefs_t:file getattr;
19
-allow mysqld_t proc_net_t:file { read open };
20
-
21
-# allow rsyncd to listen on port 4444
22
-allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect };
23
-

+ 0
- 29
mariadb/centos/files/mariadb-ssl-cypher.patch View File

@@ -1,30 +0,0 @@
1
----
2
- mysql-test/r/ssl_8k_key.result | 4 ++--
3
- mysql-test/t/ssl_8k_key.test   | 2 +-
4
- 2 files changed, 3 insertions(+), 3 deletions(-)
5
-
6
-diff --git a/mysql-test/r/ssl_8k_key.result b/mysql-test/r/ssl_8k_key.result
7
-index b33a1d2..ff9d0cc 100644
8
---- a/mysql-test/r/ssl_8k_key.result
9
-+++ b/mysql-test/r/ssl_8k_key.result
10
-@@ -1,2 +1,2 @@
11
--Variable_name	Value
12
--Ssl_cipher	DHE-RSA-AES256-SHA
13
-+have_ssl
14
-+1
15
-diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test
16
-index 27cffdc..4b81648 100644
17
---- a/mysql-test/t/ssl_8k_key.test
18
-+++ b/mysql-test/t/ssl_8k_key.test
19
-@@ -5,7 +5,7 @@
20
- #
21
- # Bug#29784 YaSSL assertion failure when reading 8k key.
22
- #
23
----exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
24
-+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
25
- 
26
- ##  This test file is for testing encrypted communication only, not other
27
- ##  encryption routines that the SSL library happens to provide!
28
-1.9.1
29
-

+ 0
- 39
mariadb/centos/files/mariadb-strmov.patch View File

@@ -1,40 +0,0 @@
1
-Remove overly optimistic definition of strmov() as stpcpy().
2
-
3
-mysql uses this macro with overlapping source and destination strings,
4
-which is verboten per spec, and fails on some Red Hat platforms.
5
-Deleting the definition is sufficient to make it fall back to a
6
-byte-at-a-time copy loop, which should consistently give the
7
-expected behavior.
8
-
9
-Note: the particular case that prompted this patch is reported and fixed
10
-at http://bugs.mysql.com/bug.php?id=48864.  However, my faith in upstream's
11
-ability to detect this type of error is low, and I also see little evidence
12
-of any real performance gain from optimizing these calls.  So I'm keeping
13
-this patch.
14
-
15
----
16
- include/m_string.h | 8 --------
17
- 1 file changed, 8 deletions(-)
18
-
19
-diff --git a/include/m_string.h b/include/m_string.h
20
-index 7437ea8..bb3ab57 100644
21
---- a/include/m_string.h
22
-+++ b/include/m_string.h
23
-@@ -73,14 +73,6 @@
24
- extern void *(*my_str_realloc)(void *, size_t);
25
- extern void (*my_str_free)(void *);
26
- 
27
--#ifdef DBUG_OFF
28
--#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER)
29
--#define strmov(A,B) __builtin_stpcpy((A),(B))
30
--#elif defined(HAVE_STPCPY)
31
--#define strmov(A,B) stpcpy((A),(B))
32
--#endif
33
--#endif
34
--
35
- /* Declared in int2str() */
36
- extern const char _dig_vec_upper[];
37
- extern const char _dig_vec_lower[];
38
-1.9.1
39
-

+ 0
- 18
mariadb/centos/files/my.cnf.in View File

@@ -1,18 +0,0 @@
1
-#
2
-# This group is read both both by the client and the server
3
-# use it for options that affect everything
4
-#
5
-[client-server]
6
-
7
-#
8
-# This group is read by the server
9
-#
10
-[mysqld]
11
-# Disabling symbolic-links is recommended to prevent assorted security risks
12
-symbolic-links=0
13
-
14
-#
15
-# include all files from the config directory
16
-#
17
-!includedir @INSTALL_SYSCONF2DIR@
18
-

+ 0
- 39
mariadb/centos/files/mysql-check-socket.sh View File

@@ -1,39 +0,0 @@
1
-#!/bin/sh
2
-
3
-# We check if there is already a process using the socket file,
4
-# since otherwise the systemd service file could report false
5
-# positive result when starting and mysqld_safe could remove
6
-# a socket file, which is actually being used by a different daemon.
7
-
8
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
9
-
10
-if test -e "$socketfile" ; then
11
-    echo "Socket file $socketfile exists." >&2
12
-
13
-    # no write permissions
14
-    if ! test -w "$socketfile" ; then
15
-        echo "Not enough permission to write to the socket file $socketfile, which is suspicious." >&2
16
-        echo "Please, remove $socketfile manually to start the service." >&2
17
-        exit 1
18
-    fi
19
-
20
-    # not a socket file
21
-    if ! test -S "$socketfile" ; then
22
-        echo "The file $socketfile is not a socket file, which is suspicious." >&2
23
-        echo "Please, remove $socketfile manually to start the service." >&2
24
-        exit 1
25
-    fi
26
-
27
-    # some process uses the socket file
28
-    if fuser "$socketfile" &>/dev/null ; then
29
-        socketpid=$(fuser "$socketfile" 2>/dev/null)
30
-        echo "Is another MySQL daemon already running with the same unix socket?" >&2
31
-        echo "Please, stop the process $socketpid or remove $socketfile manually to start the service." >&2
32
-        exit 1
33
-    fi
34
-
35
-    # socket file is a garbage
36
-    echo "No process is using $socketfile, which means it is a garbage, so it will be removed automatically." >&2
37
-fi
38
-
39
-exit 0

+ 0
- 39
mariadb/centos/files/mysql-check-upgrade.sh View File

@@ -1,39 +0,0 @@
1
-#!/bin/sh
2
-
3
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
4
-
5
-upgrade_info_file="$datadir/mysql_upgrade_info"
6
-version=0
7
-# get version as integer from mysql_upgrade_info file
8
-if [ -f "$upgrade_info_file" ] && [ -r "$upgrade_info_file" ] ; then
9
-    version_major=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\1/')
10
-    version_minor=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\2/')
11
-    if [[ $version_major =~ ^[0-9]+$ ]] && [[ $version_minor =~ ^[0-9]+$ ]] ; then
12
-        version=$((version_major*100+version_minor))
13
-    fi
14
-fi
15
-
16
-# compute current version as integer
17
-thisversion=$((@MAJOR_VERSION@*100+@MINOR_VERSION@))
18
-
19
-# provide warning in cases we should run mysql_upgrade
20
-if [ $version -ne $thisversion ] ; then
21
-
22
-    # give extra warning if some version seems to be skipped
23
-    if [ $version -gt 0 ] && [ $version -lt 505 ] ; then
24
-        echo "The datadir located at $datadir seems to be older than of a version 5.5. Please, mind that as a general rule, to upgrade from one release series to another, go to the next series rather than skipping a series." >&2
25
-    fi
26
-
27
-    cat <<EOF >&2
28
-The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps:
29
-
30
-  1. Back-up your data before with 'mysql_upgrade'
31
-  2. Start the database daemon using 'service @DAEMON_NAME@ start'
32
-  3. Run 'mysql_upgrade' with a database user that has sufficient privileges
33
-
34
-Read more about 'mysql_upgrade' usage at:
35
-https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/
36
-EOF
37
-fi
38
-
39
-exit 0

+ 0
- 26
mariadb/centos/files/mysql-embedded-check.c View File

@@ -1,26 +0,0 @@
1
-/* simple test program to see if we can link the embedded server library */
2
-
3
-#include <stdio.h>
4
-#include <stdlib.h>
5
-#include <stdarg.h>
6
-
7
-#include "mysql.h"
8
-
9
-MYSQL *mysql;
10
-
11
-static char *server_options[] = \
12
-       { "mysql_test", "--defaults-file=my.cnf", NULL };
13
-int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
14
-
15
-static char *server_groups[] = { "libmysqld_server", 
16
-                                 "libmysqld_client", NULL };
17
-
18
-int main(int argc, char **argv)
19
-{
20
-   mysql_library_init(num_elements, server_options, server_groups);
21
-   mysql = mysql_init(NULL);
22
-   mysql_close(mysql);
23
-   mysql_library_end();
24
-
25
-   return 0;
26
-}

+ 0
- 137
mariadb/centos/files/mysql-prepare-db-dir.sh View File

@@ -1,137 +0,0 @@
1
-#!/bin/sh
2
-
3
-# This script creates the mysql data directory during first service start.
4
-# In subsequent starts, it does nothing much.
5
-
6
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
7
-
8
-# Returns content of the specified directory
9
-# If listing files fails, fake-file is returned so which means
10
-# we'll behave like there was some data initialized
11
-# @param <dir> datadir
12
-ls_check_datadir ()
13
-{
14
-    ls -A "$1" 2>/dev/null
15
-    test $? -eq 0 || echo "fake-file"
16
-}
17
-
18
-# Checks whether datadir should be initialized
19
-# @param <dir> datadir
20
-should_initialize ()
21
-{
22
-    case `ls_check_datadir "$1"` in
23
-    ""|lost+found|*.err) true ;;
24
-    *) false ;;
25
-    esac
26
-}
27
-
28
-# If two args given first is user, second is group
29
-# otherwise the arg is the systemd service file
30
-if [ "$#" -eq 2 ]
31
-then
32
-    myuser="$1"
33
-    mygroup="$2"
34
-else
35
-    # Absorb configuration settings from the specified systemd service file,
36
-    # or the default service if not specified
37
-    SERVICE_NAME="$1"
38
-    if [ x"$SERVICE_NAME" = x ]
39
-    then
40
-        SERVICE_NAME=@DAEMON_NAME@.service
41
-    fi
42
-
43
-    myuser=`systemctl show -p User "${SERVICE_NAME}" |
44
-      sed 's/^User=//'`
45
-    if [ x"$myuser" = x ]
46
-    then
47
-        myuser=mysql
48
-    fi
49
-
50
-    mygroup=`systemctl show -p Group "${SERVICE_NAME}" |
51
-      sed 's/^Group=//'`
52
-    if [ x"$mygroup" = x ]
53
-    then
54
-        mygroup=mysql
55
-    fi
56
-fi
57
-
58
-# Set up the errlogfile with appropriate permissions
59
-touch "$errlogfile"
60
-ret=$?
61
-# Provide some advice if the log file cannot be touched
62
-if [ $ret -ne 0 ] ; then
63
-    errlogdir=$(dirname $errlogfile)
64
-    if ! [ -d "$errlogdir" ] ; then
65
-        echo "The directory $errlogdir does not exist."
66
-    elif [ -f "$errlogfile" ] ; then
67
-        echo "The log file $errlogfile cannot be touched, please, fix its permissions."
68
-    else
69
-        echo "The log file $errlogfile could not be created."
70
-    fi
71
-    echo "The daemon will be run under $myuser:$mygroup"
72
-    exit 1
73
-fi
74
-chown "$myuser:$mygroup" "$errlogfile"
75
-chmod 0640 "$errlogfile"
76
-[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
77
-
78
-# Make the data directory if doesn't exist or empty
79
-if should_initialize "$datadir" ; then
80
-    # First, make sure $datadir is there with correct permissions
81
-    # (note: if it's not, and we're not root, this'll fail ...)
82
-    if [ ! -e "$datadir" -a ! -h "$datadir" ]
83
-    then
84
-        mkdir -p "$datadir" || exit 1
85
-    fi
86
-    chown "$myuser:$mygroup" "$datadir"
87
-    chmod 0755 "$datadir"
88
-    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
89
-
90
-    # Now create the database
91
-    echo "Initializing @NICE_PROJECT_NAME@ database"
92
-    # Avoiding deletion of files not created by mysql_install_db is
93
-    # guarded by time check and sleep should help work-arounded
94
-    # potential issues on systems with 1 second resolution timestamps
95
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19
96
-    INITDB_TIMESTAMP=`LANG=C date -u`
97
-    sleep 1
98
-    @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser"
99
-    ret=$?
100
-    if [ $ret -ne 0 ] ; then
101
-        echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2
102
-        echo "Perhaps @sysconfdir@/my.cnf is misconfigured or there is some problem with permissions of $datadir." >&2
103
-        # Clean up any partially-created database files
104
-        if [ ! -e "$datadir/mysql/user.frm" ] && [ -d "$datadir" ] ; then
105
-            echo "Initialization of @NICE_PROJECT_NAME@ database was not finished successfully." >&2
106
-            echo "Files created so far will be removed." >&2
107
-            find "$datadir" -mindepth 1 -maxdepth 1 -newermt "$INITDB_TIMESTAMP" \
108
-                 -not -name "lost+found" -exec rm -rf {} +
109
-            if [ $? -ne 0 ] ; then
110
-                echo "Removing of created files was not successfull." >&2
111
-                echo "Please, clean directory $datadir manually." >&2
112
-            fi
113
-        else
114
-            echo "However, part of data has been initialized and those will not be removed." >&2
115
-            echo "Please, clean directory $datadir manually." >&2
116
-        fi
117
-        exit $ret
118
-    fi
119
-    # upgrade does not need to be run on a fresh datadir
120
-    echo "@VERSION@-MariaDB" >"$datadir/mysql_upgrade_info"
121
-    # In case we're running as root, make sure files are owned properly
122
-    chown -R "$myuser:$mygroup" "$datadir"
123
-else
124
-    if [ -d "$datadir/mysql/" ] ; then
125
-        # mysql dir exists, it seems data are initialized properly
126
-        echo "Database @NICE_PROJECT_NAME@ is probably initialized in $datadir already, nothing is done."
127
-        echo "If this is not the case, make sure the $datadir is empty before running `basename $0`."
128
-    else
129
-        # if the directory is not empty but mysql/ directory is missing, then
130
-        # print error and let user to initialize manually or empty the directory
131
-        echo "Database @NICE_PROJECT_NAME@ is not initialized, but the directory $datadir is not empty, so initialization cannot be done."
132
-        echo "Make sure the $datadir is empty before running `basename $0`."
133
-        exit 1
134
-    fi
135
-fi
136
-
137
-exit 0

+ 0
- 58
mariadb/centos/files/mysql-scripts-common.sh View File

@@ -1,58 +0,0 @@
1
-#!/bin/sh
2
-
3
-# Some useful functions used in other MySQL helper scripts
4
-# This scripts defines variables datadir, errlogfile, socketfile
5
-
6
-export LC_ALL=C
7
-
8
-# extract value of a MySQL option from config files
9
-# Usage: get_mysql_option VARNAME DEFAULT SECTION [ SECTION, ... ]
10
-# result is returned in $result
11
-# We use my_print_defaults which prints all options from multiple files,
12
-# with the more specific ones later; hence take the last match.
13
-get_mysql_option(){
14
-	if [ $# -ne 3 ] ; then
15
-		echo "get_mysql_option requires 3 arguments: section option default_value"
16
-		return
17
-	fi
18
-	sections="$1"
19
-	option_name="$2"
20
-	default_value="$3"
21
-	result=`@bindir@/my_print_defaults $sections | sed -n "s/^--${option_name}=//p" | tail -n 1`
22
-	if [ -z "$result" ]; then
23
-	    # not found, use default
24
-	    result="${default_value}"
25
-	fi
26
-}
27
-
28
-# Defaults here had better match what mysqld_safe will default to
29
-# The option values are generally defined on three important places
30
-# on the default installation:
31
-#  1) default values are hardcoded in the code of mysqld daemon or
32
-#     mysqld_safe script
33
-#  2) configurable values are defined in @sysconfdir@/my.cnf
34
-#  3) default values for helper scripts are specified bellow
35
-# So, in case values are defined in my.cnf, we need to get that value.
36
-# In case they are not defined in my.cnf, we need to get the same value
37
-# in the daemon, as in the helper scripts. Thus, default values here
38
-# must correspond with values defined in mysqld_safe script and source
39
-# code itself.
40
-
41
-server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ client-server"
42
-
43
-get_mysql_option "$server_sections" datadir "@MYSQL_DATADIR@"
44
-datadir="$result"
45
-
46
-# if there is log_error in the my.cnf, my_print_defaults still
47
-# returns log-error
48
-# log-error might be defined in mysqld_safe and mysqld sections,
49
-# the former has bigger priority
50
-get_mysql_option "$server_sections" log-error "$datadir/`uname -n`.err"
51
-errlogfile="$result"
52
-
53
-get_mysql_option "$server_sections" socket "@MYSQL_UNIX_ADDR@"
54
-socketfile="$result"
55
-
56
-get_mysql_option "$server_sections" pid-file "$datadir/`uname -n`.pid"
57
-pidfile="$result"
58
-

+ 0
- 45
mariadb/centos/files/mysql-wait-ready.sh View File

@@ -1,45 +0,0 @@
1
-#!/bin/sh
2
-
3
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
4
-
5
-# This script waits for mysqld to be ready to accept connections
6
-# (which can be many seconds or even minutes after launch, if there's
7
-# a lot of crash-recovery work to do).
8
-# Running this as ExecStartPost is useful so that services declared as
9
-# "After mysqld" won't be started until the database is really ready.
10
-
11
-if [ $# -ne 1 ] ; then
12
-	echo "You need to pass daemon pid as an argument for this script."
13
-	exit 20
14
-fi
15
-
16
-# Service file passes us the daemon's PID (actually, mysqld_safe's PID)
17
-daemon_pid="$1"
18
-
19
-# Wait for the server to come up or for the mysqld process to disappear
20
-ret=0
21
-while /bin/true; do
22
-	# Check process still exists
23
-	if ! [ -d "/proc/${daemon_pid}" ] ; then
24
-	    ret=1
25
-	    break
26
-	fi
27
-	RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
28
-	mret=$?
29
-	if [ $mret -eq 0 ] ; then
30
-	    break
31
-	fi
32
-	# exit codes 1, 11 (EXIT_CANNOT_CONNECT_TO_SERVICE) are expected,
33
-	# anything else suggests a configuration error
34
-	if [ $mret -ne 1 -a $mret -ne 11 ]; then
35
-            echo "Cannot check for @NICE_PROJECT_NAME@ Daemon startup because of mysqladmin failure." >&2
36
-	    ret=$mret
37
-	    break
38
-	fi
39
-	# "Access denied" also means the server is alive
40
-	echo "$RESPONSE" | grep -q "Access denied for user" && break
41
-
42
-	sleep 1
43
-done
44
-
45
-exit $ret

+ 0
- 36
mariadb/centos/files/mysql-wait-stop.sh View File

@@ -1,36 +0,0 @@
1
-#!/bin/sh
2
-
3
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
4
-
5
-# This script waits for mysqld to be properly stopped
6
-# (which can be many seconds in some large load).
7
-# Running this as ExecStopPost is useful so that starting which is done
8
-# as part of restart doesn't see the former process still running.
9
-
10
-# Wait for the server to properly end the main server
11
-ret=0
12
-TIMEOUT=60
13
-SECONDS=0
14
-
15
-if ! [ -f "$pidfile" ]; then
16
-	exit 0
17
-fi
18
-
19
-MYSQLPID=`cat "$pidfile" 2>/dev/null`
20
-if [ -z "$MYSQLPID" ] ; then
21
-	exit 2
22
-fi
23
-
24
-while /bin/true; do
25
-	# Check process still exists
26
-	if ! [ -d "/proc/${MYSQLPID}" ] ; then
27
-	    break
28
-	fi
29
-	if [ $SECONDS -gt $TIMEOUT ] ; then
30
-	    ret=3
31
-	    break
32
-	fi
33
-	sleep 1
34
-done
35
-
36
-exit $ret

+ 0
- 186
mariadb/centos/files/mysql.init.in View File

@@ -1,186 +0,0 @@
1
-#!/bin/sh
2
-#
3
-# @DAEMON_NAME@	This shell script takes care of starting and stopping
4
-#		the MySQL subsystem (mysqld).
5
-#
6
-# chkconfig: - 64 36
7
-# description:	MySQL database server.
8
-# processname: mysqld
9
-# config: @sysconfdir@/my.cnf
10
-# pidfile: /var/run/@DAEMON_NAME@/@DAEMON_NAME@.pid
11
-### BEGIN INIT INFO
12
-# Provides: mysqld
13
-# Required-Start: $local_fs $remote_fs $network $named $syslog $time
14
-# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
15
-# Short-Description: start and stop MySQL server
16
-# Description: MySQL database server
17
-### END INIT INFO
18
-
19
-# Source function library.
20
-. /etc/rc.d/init.d/functions
21
-
22
-# Source networking configuration.
23
-. /etc/sysconfig/network
24
-
25
-
26
-exec="@bindir@/mysqld_safe"
27
-prog="@DAEMON_NAME@"
28
-
29
-# Set timeouts here so they can be overridden from @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@
30
-STARTTIMEOUT=300
31
-STOPTIMEOUT=60
32
-
33
-# User and group the daemon will run under
34
-MYUSER=mysql
35
-MYGROUP=mysql
36
-
37
-# Edit the following file in order to re-write some of the environment
38
-# variables defined above, like $STARTTIMEOUT, $STOPTIMEOUT, $exec
39
-[ -e @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ ] && . @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@
40
-
41
-lockfile=/var/lock/subsys/$prog
42
-
43
-# get options from my.cnf
44
-source "@libexecdir@/mysql-scripts-common"
45
-
46
-start(){
47
-    [ -x $exec ] || exit 5
48
-
49
-    # check permissions
50
-    if ! touch $(dirname $socketfile) &>/dev/null ; then
51
-        action $"Starting $prog: " /bin/false
52
-        return 4
53
-    fi
54
-
55
-    # check to see if it's already running
56
-    MYSQLDRUNNING=0
57
-    if [ -f "$pidfile" ]; then
58
-	MYSQLPID=`cat "$pidfile" 2>/dev/null`
59
-	if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then
60
-	    MYSQLDRUNNING=1
61
-	fi
62
-    fi
63
-    RESPONSE=`@bindir@/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
64
-    if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then
65
-	# already running, do nothing
66
-	action $"Starting $prog: " /bin/true
67
-	ret=0
68
-    elif [ $MYSQLDRUNNING = 1 ] && echo "$RESPONSE" | grep -q "Access denied for user"
69
-    then
70
-	# already running, do nothing
71
-	action $"Starting $prog: " /bin/true
72
-	ret=0
73
-    else
74
-        @libexecdir@/mysql-prepare-db-dir $MYUSER $MYGROUP || return 4
75
-        @libexecdir@/mysql-check-socket || return 1
76
-
77
-	# Pass all the options determined above, to ensure consistent behavior.
78
-	# In many cases mysqld_safe would arrive at the same conclusions anyway
79
-	# but we need to be sure.  (An exception is that we don't force the
80
-	# log-error setting, since this script doesn't really depend on that,
81
-	# and some users might prefer to configure logging to syslog.)
82
-	# Note: set --basedir to prevent probes that might trigger SELinux
83
-	# alarms, per bug #547485
84
-	$exec   --datadir="$datadir" --socket="$socketfile" \
85
-		--pid-file="$pidfile" \
86
-		--basedir=@prefix@ --user=$MYUSER >/dev/null 2>&1 &
87
-	safe_pid=$!
88
-
89
-	# Wait until the daemon is up
90
-        @libexecdir@/mysql-wait-ready "$safe_pid"
91
-        ret=$?
92
-
93
-	if [ $ret -eq 0 ]; then
94
-	    action $"Starting $prog: " /bin/true
95
-	    chmod o+r $pidfile >/dev/null 2>&1
96
-	    touch $lockfile
97
-	else
98
-	    action $"Starting $prog: " /bin/false
99
-	fi
100
-    fi
101
-    return $ret
102
-}
103
-
104
-stop(){
105
-	if [ ! -f "$pidfile" ]; then
106
-	    # not running; per LSB standards this is "ok"
107
-	    action $"Stopping $prog: " /bin/true
108
-	    return 0
109
-	fi
110
-	MYSQLPID=`cat "$pidfile" 2>/dev/null`
111
-	if [ -n "$MYSQLPID" ]; then
112
-	    if ! [ -d "/proc/$MYSQLPID" ] ; then
113
-		# process doesn't run anymore
114
-		action $"Stopping $prog: " /bin/true
115
-		return 0
116
-	    fi
117
-	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
118
-	    ret=$?
119
-	    if [ $ret -eq 0 ]; then
120
-		TIMEOUT="$STOPTIMEOUT"
121
-		while [ $TIMEOUT -gt 0 ]; do
122
-		    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
123
-		    sleep 1
124
-		    let TIMEOUT=${TIMEOUT}-1
125
-		done
126
-		if [ $TIMEOUT -eq 0 ]; then
127
-		    echo "Timeout error occurred trying to stop MySQL Daemon."
128
-		    ret=1
129
-		    action $"Stopping $prog: " /bin/false
130
-		else
131
-		    rm -f $lockfile
132
-		    rm -f "$socketfile"
133
-		    action $"Stopping $prog: " /bin/true
134
-		fi
135
-	    else
136
-		# kill command failed, probably insufficient permissions
137
-		action $"Stopping $prog: " /bin/false
138
-		ret=4
139
-	    fi
140
-	else
141
-	    # failed to read pidfile, probably insufficient permissions
142
-	    action $"Stopping $prog: " /bin/false
143
-	    ret=4
144
-	fi
145
-	return $ret
146
-}
147
- 
148
-restart(){
149
-    stop
150
-    start
151
-}
152
-
153
-condrestart(){
154
-    [ -e $lockfile ] && restart || :
155
-}
156
-
157
-
158
-# See how we were called.
159
-case "$1" in
160
-  start)
161
-    start
162
-    ;;
163
-  stop)
164
-    stop
165
-    ;;
166
-  status)
167
-    status -p "$pidfile" $prog
168
-    ;;
169
-  restart)
170
-    restart
171
-    ;;
172
-  condrestart|try-restart)
173
-    condrestart
174
-    ;;
175
-  reload)
176
-    exit 3
177
-    ;;
178
-  force-reload)
179
-    restart
180
-    ;;
181
-  *)
182
-    echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
183
-    exit 2
184
-esac
185
-
186
-exit $?

+ 0
- 70
mariadb/centos/files/mysql.service.in View File

@@ -1,70 +0,0 @@
1
-# It's not recommended to modify this file in-place, because it will be
2
-# overwritten during package upgrades.  If you want to customize, the
3
-# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
4
-# containing
5
-#	.include /usr/lib/systemd/system/@DAEMON_NAME@.service
6
-#	...make your changes here...
7
-# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
8
-# which doesn't need to include ".include" call and which will be parsed
9
-# after the file @DAEMON_NAME@.service itself is parsed.
10
-#
11
-# For more info about custom unit files, see systemd.unit(5) or
12
-# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
13
-
14
-# For example, if you want to increase mysql's open-files-limit to 10000,
15
-# you need to increase systemd's LimitNOFILE setting, so create a file named
16
-# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing:
17
-#	[Service]
18
-#	LimitNOFILE=10000
19
-
20
-# Note: /usr/lib/... is recommended in the .include line though /lib/...
21
-# still works.
22
-# Don't forget to reload systemd daemon after you change unit configuration:
23
-# root> systemctl --system daemon-reload
24
-
25
-# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance.
26
-
27
-[Unit]
28
-Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
29
-After=syslog.target
30
-After=network.target
31
-
32
-[Service]
33
-Type=notify
34
-User=mysql
35
-Group=mysql
36
-
37
-ExecStartPre=@libexecdir@/mysql-check-socket
38
-ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
39
-# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
40
-# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
41
-# per bug #547485
42
-ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
43
-ExecStartPost=@libexecdir@/mysql-check-upgrade
44
-ExecStopPost=@libexecdir@/mysql-wait-stop
45
-
46
-# Setting this to true can break replication and the Type=notify settings
47
-# See also bind-address mysqld option.
48
-PrivateNetwork=false
49
-
50
-KillMode=process
51
-KillSignal=SIGTERM
52
-
53
-# Don't want to see an automated SIGKILL ever
54
-SendSIGKILL=no
55
-
56
-# Restart crashed server only, on-failure would also restart, for example, when
57
-# my.cnf contains unknown option
58
-Restart=on-abort
59
-RestartSec=5s
60
-
61
-UMask=007
62
-
63
-# Give a reasonable amount of time for the server to start up/shut down
64
-TimeoutSec=300
65
-
66
-# Place temp files in a secure directory, not /tmp
67
-PrivateTmp=true
68
-
69
-[Install]
70
-WantedBy=multi-user.target

+ 0
- 3
mariadb/centos/files/mysql.tmpfiles.d.in View File

@@ -1,3 +0,0 @@
1
-# Do not edit this file.
2
-# To override this, put /etc/tmpfiles.d/mariadb.conf instead.
3
-d @PID_FILE_DIR@ 0755 mysql mysql -

+ 0
- 77
mariadb/centos/files/mysql@.service.in View File

@@ -1,77 +0,0 @@
1
-# Multi instance version of mariadb. For if you run mutiple verions at once.
2
-# Also used for @DAEMON_NAME@@bootstrap to bootstrap Galera.
3
-#
4
-# To use multi instance variant, use [mysqld.INSTANCENAME] as sections in my.cnf
5
-# and start the service via:
6
-#	systemctl start @DAEMON_NAME@@{instancename}.server
7
-#
8
-# It's not recommended to modify this file in-place, because it will be
9
-# overwritten during package upgrades.  If you want to customize, the
10
-# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
11
-# containing
12
-#	.include /usr/lib/systemd/system/@DAEMON_NAME@.service
13
-#	...make your changes here...
14
-# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
15
-# which doesn't need to include ".include" call and which will be parsed
16
-# after the file @DAEMON_NAME@.service itself is parsed.
17
-#
18
-# For more info about custom unit files, see systemd.unit(5) or
19
-# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
20
-
21
-# For example, if you want to increase mysql's open-files-limit to 10000,
22
-# you need to increase systemd's LimitNOFILE setting, so create a file named
23
-# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing:
24
-#	[Service]
25
-#	LimitNOFILE=10000
26
-
27
-# Note: /usr/lib/... is recommended in the .include line though /lib/...
28
-# still works.
29
-# Don't forget to reload systemd daemon after you change unit configuration:
30
-# root> systemctl --system daemon-reload
31
-
32
-# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance.
33
-
34
-[Unit]
35
-Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
36
-After=syslog.target
37
-After=network.target
38
-
39
-[Service]
40
-Type=notify
41
-User=mysql
42
-Group=mysql
43
-
44
-ExecStartPre=@libexecdir@/mysql-check-socket
45
-ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
46
-# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
47
-# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
48
-# per bug #547485
49
-ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
50
-ExecStartPost=@libexecdir@/mysql-check-upgrade
51
-ExecStopPost=@libexecdir@/mysql-wait-stop
52
-
53
-# Setting this to true can break replication and the Type=notify settings
54
-# See also bind-address mysqld option.
55
-PrivateNetwork=false
56
-
57
-KillMode=process
58
-KillSignal=SIGTERM
59
-
60
-# Don't want to see an automated SIGKILL ever
61
-SendSIGKILL=no
62
-
63
-# Restart crashed server only, on-failure would also restart, for example, when
64
-# my.cnf contains unknown option
65
-Restart=on-abort
66
-RestartSec=5s
67
-
68
-UMask=007
69
-
70
-# Give a reasonable amount of time for the server to start up/shut down
71
-TimeoutSec=300
72
-
73
-# Place temp files in a secure directory, not /tmp
74
-PrivateTmp=true
75
-
76
-[Install]
77
-WantedBy=multi-user.target

+ 0
- 26
mariadb/centos/files/mysql_config_multilib.sh View File

@@ -1,26 +0,0 @@
1
-#! /bin/sh
2
-#
3
-# Wrapper script for mysql_config to support multilib
4
-#
5
-# This command respects setarch
6
-
7
-bits=$(rpm --eval %__isa_bits)
8
-
9
-case $bits in
10
-    32|64) status=known ;;
11
-        *) status=unknown ;;
12
-esac
13
-
14
-if [ "$status" = "unknown" ] ; then
15
-    echo "$0: error: command 'rpm --eval %__isa_bits' returned unknown value: $bits"
16
-    exit 1
17
-fi
18
-
19
-
20
-if [ -x @bindir@/mysql_config-$bits ] ; then
21
-    @bindir@/mysql_config-$bits "$@"
22
-else
23
-    echo "$0: error: needed binary: @bindir@/mysql_config-$bits is missing"
24
-    exit 1
25
-fi
26
-

+ 0
- 8
mariadb/centos/files/rh-skipped-tests-arm.list View File

@@ -1,8 +0,0 @@
1
-main.partition_exchange             : #1399847
2
-main.analyze_stmt_orderby           : #1399847
3
-main.explain_json_innodb            : #1399847
4
-main.explain_json_format_partitions : #1399847
5
-main.analyze_format_json            : #1399847
6
-main.explain_json                   : #1399847
7
-main.subselect_cache                : #1399847
8
-main.type_year                      : #1399847

+ 0
- 9
mariadb/centos/files/rh-skipped-tests-base.list View File

@@ -1,9 +0,0 @@
1
-main.userstat                                : #1399847
2
-main.multi_update                            : #1399847
3
-main.set_statement_notembedded_binlog        : #1399847
4
-main.ssl_7937                                : #1399847
5
-main.ssl_crl_clients                         : #1399847
6
-main.ssl_cert_verify                         : #1399847
7
-perfschema.nesting                           : #1399847
8
-perfschema.socket_summary_by_event_name_func : #1399847
9
-perfschema.socket_summary_by_instance_func   : #1399847

+ 0
- 0
mariadb/centos/files/rh-skipped-tests-ppc-s390.list View File


+ 0
- 2033
mariadb/centos/mariadb.spec
File diff suppressed because it is too large
View File


+ 0
- 1998
mariadb/centos/mariadb.spec.unmodified
File diff suppressed because it is too large
View File


Loading…
Cancel
Save