diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
| commit | 8cbb14ef5d180687f131bc44a4e8fc84083d033c (patch) | |
| tree | 091f11e2d20f95656a7b12294782eb0488fd4fcc /debian | |
| parent | 4345868382ca3525de5eb432302b6b9b957b47c1 (diff) | |
| parent | b85aa20065504bdda4bc03c2bd7eb7de38865c5d (diff) | |
| download | mariadb-git-8cbb14ef5d180687f131bc44a4e8fc84083d033c.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 3 | ||||
| -rwxr-xr-x | debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch | 21 |
2 files changed, 12 insertions, 12 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 1a43c064468..687f2356153 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -103,7 +103,8 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${ PATCHLEVEL="+maria" LOGSTRING="MariaDB build" CODENAME="$(lsb_release -sc)" -if [[ "$CODENAME" == bionic ]]; then +VERNUM="$(lsb_release -sr)" +if [[ "${VERNUM%.*}" -ge 18 ]]; then EPOCH="1:" fi diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch index 5ab8ab3d3d7..9593cd7c3e0 100755 --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch @@ -7,14 +7,13 @@ @DPATCH@ ---- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh 2008-01-29 22:41:20.000000000 +0100 -+++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh 2008-02-28 10:08:11.000000000 +0100 -@@ -372,7 +372,7 @@ then - fi - - # Create database directories --for dir in "$ldata" "$ldata/mysql" "$ldata/test" -+for dir in "$ldata" "$ldata/mysql" - do - if test ! -d "$dir" - then +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -36,7 +36,6 @@ in_rpm=0 + ip_only=0 + cross_bootstrap=0 + install_params="create database if not exists mysql; +-create database if not exists test; + use mysql;" + auth_root_authentication_method=normal + auth_root_socket_user='root' |