diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-21 12:15:19 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-22 12:54:52 +0100 |
| commit | dc94bd09b875b7aac106761f1a398c1c6de036f9 (patch) | |
| tree | 28d2f7436cbfc4cab462e821d042b19f9e083ac6 /debian | |
| parent | 0ba168020efb7343477d9a24f2335d7f9a7dacfe (diff) | |
| download | mariadb-git-dc94bd09b875b7aac106761f1a398c1c6de036f9.tar.gz | |
MDEV-7520 gtid replication broken during upgrade to debian 10.0.16
Don't binlog mariadb setup sql statements:
* use "mysql_install_db --disable-log-bin"
* use "mysqld --bootstrap --disable-log-bin"
* use "SET sql_log_bin=0"
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.postinst | 5 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.postinst | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/dist/Debian/mariadb-server-10.0.postinst b/debian/dist/Debian/mariadb-server-10.0.postinst index 9f79b61fd05..19594fb910e 100644 --- a/debian/dist/Debian/mariadb-server-10.0.postinst +++ b/debian/dist/Debian/mariadb-server-10.0.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 @@ -40,6 +40,7 @@ set_mysql_rootpw() { # this avoids us having to call "test" or "[" on $rootpw cat << EOF > $tfile USE mysql; +SET sql_log_bin=0; UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root'; FLUSH PRIVILEGES; EOF @@ -144,7 +145,7 @@ EOF # Debian: beware of the bashisms... # Debian: can safely run on upgrades with existing databases set +e - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER + /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER set -e ## On every reconfiguration the maintenance user is recreated. diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postinst b/debian/dist/Ubuntu/mariadb-server-10.0.postinst index f6da8c442ad..1acfbc80970 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.postinst +++ b/debian/dist/Ubuntu/mariadb-server-10.0.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 @@ -41,6 +41,7 @@ set_mysql_rootpw() { # this avoids us having to call "test" or "[" on $rootpw cat << EOF > $tfile USE mysql; +SET sql_log_bin=0; UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root'; FLUSH PRIVILEGES; EOF @@ -145,7 +146,7 @@ EOF # Debian: beware of the bashisms... # Debian: can safely run on upgrades with existing databases set +e - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER + /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER set -e ## On every reconfiguration the maintenance user is recreated. |