diff options
-rw-r--r-- | debian/additions/my.cnf | 3 | ||||
-rw-r--r-- | debian/dist/Debian/control | 3 | ||||
-rw-r--r-- | debian/dist/Debian/mariadb-server-5.5.files | 1 | ||||
-rw-r--r-- | debian/dist/Ubuntu/control | 3 | ||||
-rw-r--r-- | debian/dist/Ubuntu/mariadb-server-5.5.files | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index a62465e5627..1a176cc1dc1 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -54,7 +54,8 @@ port = 3306 basedir = /usr datadir = /var/lib/mysql tmpdir = /tmp -language = /usr/share/mysql/english +lc_messages_dir = /usr/share/mysql +lc_messages = en_US skip-external-locking # # * Character sets diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 861f0ca5b11..7de203fd3f0 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -178,8 +178,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, - mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, - libmariadbclient16 (<< 5.3.4) + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, diff --git a/debian/dist/Debian/mariadb-server-5.5.files b/debian/dist/Debian/mariadb-server-5.5.files index 2ea925fcaa7..e57752ec54a 100644 --- a/debian/dist/Debian/mariadb-server-5.5.files +++ b/debian/dist/Debian/mariadb-server-5.5.files @@ -15,6 +15,7 @@ usr/bin/aria_chk usr/bin/aria_dump_log usr/bin/mysql_convert_table_format usr/bin/mysql_install_db +usr/bin/mysql_plugin usr/bin/mysql_secure_installation usr/bin/mysql_setpermission usr/bin/mysql_tzinfo_to_sql diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 7dd27754c97..fd72e8d4fb2 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -172,8 +172,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, - mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, - libmariadbclient16 (<< 5.3.4) + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files b/debian/dist/Ubuntu/mariadb-server-5.5.files index 58da345b737..d08e6253fe8 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.files +++ b/debian/dist/Ubuntu/mariadb-server-5.5.files @@ -17,6 +17,7 @@ usr/bin/aria_chk usr/bin/aria_dump_log usr/bin/mysql_convert_table_format usr/bin/mysql_install_db +usr/bin/mysql_plugin usr/bin/mysql_secure_installation usr/bin/mysql_setpermission usr/bin/mysql_tzinfo_to_sql |