Commit b0a392fd authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Updated changelog and refreshed patches after 10.0.24 import

parent f78b6e7d
mariadb-10.0 (10.0.24-1) UNRELEASED; urgency=low
* New upstream release 10.0.24
- Drop auth_socket patches as MDEV-8375 was partially fixed upstream
- Refresh other patches
-- Otto Kekäläinen <otto@seravo.fi> Sat, 20 Feb 2016 14:23:50 +0200
mariadb-10.0 (10.0.23-3) unstable; urgency=low mariadb-10.0 (10.0.23-3) unstable; urgency=low
* Add Lintian overrides for TokuDB sources that indeed need autotools files * Add Lintian overrides for TokuDB sources that indeed need autotools files
......
...@@ -84,7 +84,7 @@ Last-Update: 2014-10-02 ...@@ -84,7 +84,7 @@ Last-Update: 2014-10-02
44 ru_UA Russian - Ukraine 8 11 , . russian 44 ru_UA Russian - Ukraine 8 11 , . russian
--- a/sql/mysqld.cc --- a/sql/mysqld.cc
+++ b/sql/mysqld.cc +++ b/sql/mysqld.cc
@@ -7095,7 +7095,7 @@ struct my_option my_long_options[]= @@ -7085,7 +7085,7 @@ struct my_option my_long_options[]=
&opt_show_slave_auth_info, &opt_show_slave_auth_info, 0, &opt_show_slave_auth_info, &opt_show_slave_auth_info, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"skip-bdb", OPT_DEPRECATED_OPTION, {"skip-bdb", OPT_DEPRECATED_OPTION,
...@@ -93,7 +93,7 @@ Last-Update: 2014-10-02 ...@@ -93,7 +93,7 @@ Last-Update: 2014-10-02
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DISABLE_GRANT_OPTIONS #ifndef DISABLE_GRANT_OPTIONS
{"skip-grant-tables", 0, {"skip-grant-tables", 0,
@@ -8389,7 +8389,7 @@ mysqld_get_one_option(int optid, @@ -8414,7 +8414,7 @@ mysqld_get_one_option(int optid,
break; break;
case OPT_DEPRECATED_OPTION: case OPT_DEPRECATED_OPTION:
sql_print_warning("'%s' is deprecated. It does nothing and exists only " sql_print_warning("'%s' is deprecated. It does nothing and exists only "
......
From: Sergey Vojtovich <svoj@mariadb.org>
Description: Update tests to match built-in unix-socket plugin
Remove this the day passwordless root account becomes the default in
upstream too and not just in Debian packaging.
Date: Fri, 18 Dec 2015 22:51:12 +0400
Subject: [PATCH] Filter out unix-socket from unrelated test cases
Origin: https://github.com/MariaDB/server/commit/5efb8f1677f680e6d6ab2304630495c522475dc3.patch
Bug: https://mariadb.atlassian.net/browse/MDEV-8375
--- a/mysql-test/suite/plugins/r/auth_v0100.result
+++ b/mysql-test/suite/plugins/r/auth_v0100.result
@@ -1,9 +1,8 @@
install soname 'auth_0x0100';
-select plugin_name, plugin_type_version from information_schema.plugins where plugin_type='authentication' order by plugin_name;
+select plugin_name, plugin_type_version from information_schema.plugins where
+plugin_type='authentication' and plugin_library is not null order by plugin_name;
plugin_name plugin_type_version
auth_0x0100 1.0
-mysql_native_password 2.0
-mysql_old_password 2.0
create user tt identified via auth_0x0100;
grant select on test.* to zzzzzzzzzzzzzzzz;
connect(localhost,tt,,test,MASTER_MYPORT,MASTER_MYSOCK);
--- a/mysql-test/suite/plugins/t/auth_v0100.test
+++ b/mysql-test/suite/plugins/t/auth_v0100.test
@@ -6,7 +6,8 @@ if (!$AUTH_0X0100_SO) {
install soname 'auth_0x0100';
-select plugin_name, plugin_type_version from information_schema.plugins where plugin_type='authentication' order by plugin_name;
+select plugin_name, plugin_type_version from information_schema.plugins where
+plugin_type='authentication' and plugin_library is not null order by plugin_name;
create user tt identified via auth_0x0100;
grant select on test.* to zzzzzzzzzzzzzzzz;
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -30,7 +30,7 @@ perl;
thread-concurrency super-large-pages mutex-deadlock-detector
connect null-audit aria oqgraph sphinx thread-handling
test-sql-discovery rpl-semi-sync query-cache-info
- query-response-time metadata-lock-info locales/;
+ query-response-time metadata-lock-info locales unix-socket/;
# And substitute the content some environment variables with their
# names:
...@@ -7,27 +7,6 @@ Subject: [PATCH] Fixed auth_socket static compilation ...@@ -7,27 +7,6 @@ Subject: [PATCH] Fixed auth_socket static compilation
Origin: https://github.com/MariaDB/server/commit/3402f7a85364e26fe85dfff3b5d803a8497042aa.patch Origin: https://github.com/MariaDB/server/commit/3402f7a85364e26fe85dfff3b5d803a8497042aa.patch
Bug: https://mariadb.atlassian.net/browse/MDEV-8375 Bug: https://mariadb.atlassian.net/browse/MDEV-8375
--- a/plugin/auth_socket/CMakeLists.txt
+++ b/plugin/auth_socket/CMakeLists.txt
@@ -65,6 +65,6 @@ ENDIF()
ENDIF()
IF(ok)
- MYSQL_ADD_PLUGIN(auth_socket auth_socket.c MODULE_ONLY)
+ MYSQL_ADD_PLUGIN(auth_socket auth_socket.c)
ENDIF()
--- a/plugin/auth_socket/auth_socket.c
+++ b/plugin/auth_socket/auth_socket.c
@@ -105,7 +105,7 @@ static struct st_mysql_auth socket_auth_
socket_auth
};
-maria_declare_plugin(socket_auth)
+maria_declare_plugin(auth_socket)
{
MYSQL_AUTHENTICATION_PLUGIN,
&socket_auth_handler,
--- a/mysql-test/mysql-test-run.pl --- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl
@@ -3641,6 +3641,9 @@ sub mysql_install_db { @@ -3641,6 +3641,9 @@ sub mysql_install_db {
......
...@@ -12,4 +12,3 @@ mysqld_multi_confd.patch ...@@ -12,4 +12,3 @@ mysqld_multi_confd.patch
mysqld_multi.server_lsb-header.patch mysqld_multi.server_lsb-header.patch
mdev-8375-passwordless-root-via-socket-auth.patch mdev-8375-passwordless-root-via-socket-auth.patch
mdev-8375-built-in-auth-socket.patch mdev-8375-built-in-auth-socket.patch
mdev-8375-auth-socket-test.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment