diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-07 13:21:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-03-07 13:21:02 +0100 |
| commit | 2db62f686e148f09fe5fd0b385fc71f2a3c4a133 (patch) | |
| tree | cf1d5d6f0d05f1b50be96d943476173228cbd458 /debian | |
| parent | 143f5d9172647a43cdcf5c27b8a78f32c9f639c0 (diff) | |
| parent | d61573d3e5c8f9d85b88f9fa2e79160b159bf67d (diff) | |
| download | mariadb-git-2db62f686e148f09fe5fd0b385fc71f2a3c4a133.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.1.postinst | 5 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.1.postinst | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/dist/Debian/mariadb-server-10.1.postinst b/debian/dist/Debian/mariadb-server-10.1.postinst index 88de8a5126a..fff75988353 100644 --- a/debian/dist/Debian/mariadb-server-10.1.postinst +++ b/debian/dist/Debian/mariadb-server-10.1.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.1.postinst b/debian/dist/Ubuntu/mariadb-server-10.1.postinst index 73e125b9651..b30dc5963be 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.1.postinst +++ b/debian/dist/Ubuntu/mariadb-server-10.1.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. @@ -213,7 +214,7 @@ EOF # admin might already have chosen to remove one or more plugins. Newlines are necessary. install_plugins=`/bin/echo -e \ "USE mysql;\n" \ - "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ + "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` |