diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-10 12:08:36 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-10 12:33:08 +0200 |
commit | ecdb39a9f51ebbdafae167889ec65ee817e07de6 (patch) | |
tree | 4e610b9329268c638bee061540f423f47500f064 /debian | |
parent | 94e18e2987183e251849838a38ddc588dfefa58a (diff) | |
download | mariadb-git-ecdb39a9f51ebbdafae167889ec65ee817e07de6.tar.gz |
Fix problems from 5.5 merge
* Update mysqld_safe script to remove duplicated parameter --crash-script
* Make --core-file-size accept underscores as well as dashes correctly.
* Add mysqld_safe_helper to Debian and Ubuntu files.
* Update innodb minor version to 35
Diffstat (limited to 'debian')
-rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.files.in | 1 | ||||
-rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.files.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in index 88516bb6089..9feec684ff0 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files.in +++ b/debian/dist/Debian/mariadb-server-10.0.files.in @@ -38,6 +38,7 @@ usr/bin/mysql_zap usr/bin/mysqlbinlog usr/bin/mysqld_multi usr/bin/mysqld_safe +usr/bin/mysqld_safe_helper usr/bin/mysqlhotcopy usr/bin/perror usr/bin/replace diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in index 849a763dccd..a5e8bd6e717 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in +++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in @@ -40,6 +40,7 @@ usr/bin/mysql_zap usr/bin/mysqlbinlog usr/bin/mysqld_multi usr/bin/mysqld_safe +usr/bin/mysqld_safe_helper usr/bin/mysqlhotcopy usr/bin/perror usr/bin/replace |