mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "MDEV-12501 -- set --maturity-level by default"

Browse source 
This reverts commit 1af2d7ba23.
This commit is contained in:
Vesa Pentti 2017-12-05 08:49:28 +00:00
parent 1af2d7ba23
commit 5868a184fa
24 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
VERSION
View file

@ -1,4 +1,3 @@
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=3
MYSQL_VERSION_PATCH=3
SERVER_MATURITY=beta

5
cmake/mysql_version.cmake
View file

@ -48,7 +48,6 @@ MACRO(GET_MYSQL_VERSION)
MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_MINOR" MINOR_VERSION)
MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_PATCH" PATCH_VERSION)
MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_EXTRA" EXTRA_VERSION)
MYSQL_GET_CONFIG_VALUE("SERVER_MATURITY" SERVER_MATURITY)
IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
NOT "${MINOR_VERSION}" MATCHES "[0-9]+" OR
@ -70,10 +69,6 @@ ENDMACRO()
# Get mysql version and other interesting variables
GET_MYSQL_VERSION()
# Maturity level
string(TOUPPER ${SERVER_MATURITY} SERVER_MATURITY)
SET(SERVER_MATURITY_LEVEL MariaDB_PLUGIN_MATURITY_${SERVER_MATURITY})
SET(MYSQL_TCP_PORT_DEFAULT 0)
IF(NOT MYSQL_TCP_PORT)
SET(MYSQL_TCP_PORT 3306)

1
extra/mariabackup/encryption_plugin.cc
View file

@ -165,7 +165,6 @@ static void encryption_plugin_init(int argc, char **argv)
{
/* Patch optional and mandatory plugins, we only need to load the one in xb_plugin_load. */
mysql_optional_plugins[0] = mysql_mandatory_plugins[0] = 0;
plugin_maturity = MariaDB_PLUGIN_MATURITY_UNKNOWN; /* mariabackup accepts all plugins */
msg("Loading encryption plugin\n");
for (int i= 1; i < argc; i++)
msg("\t Encryption plugin parameter : '%s'\n", argv[i]);

1
include/mysql_version.h.in
View file

@ -22,7 +22,6 @@
#define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@"
#define MYSQL_CONFIG_NAME "my"
#define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@"
#define SERVER_MATURITY_LEVEL @SERVER_MATURITY_LEVEL@
#ifdef WITH_WSREP
#define WSREP_PATCH_VERSION "@WSREP_PATCH_VERSION@"

2
mysql-test/include/default_mysqld.cnf
View file

@ -17,7 +17,7 @@
# Default values that applies to all MySQL Servers
[mysqld]
disable-getopt-prefix-matching
plugin-maturity=unknown
open-files-limit= 1024
local-infile
character-set-server= latin1

6
mysql-test/include/mtr_warnings.sql
View file

@ -224,12 +224,6 @@ INSERT INTO global_suppressions VALUES
("Slave I/O: Setting @slave_gtid_ignore_duplicates failed with error.*"),
("Slave I/O: Setting @slave_until_gtid failed with error.*"),
("Slave I/O: Get master GTID position failed with error.*"),
/*
MDEV-12501 -- set --maturity-level by default
*/
("Plugin .* is of maturity level .* while the server is .*"),
("THE_LAST_SUPPRESSION")||

1
mysql-test/r/mysqld--help.result
View file

@ -1535,6 +1535,7 @@ performance-schema-session-connect-attrs-size -1
performance-schema-setup-actors-size 100
performance-schema-setup-objects-size 100
performance-schema-users-size -1
plugin-maturity unknown
port 3306
port-open-timeout 0
preload-buffer-size 32768

1
mysql-test/suite/galera/galera_2nodes.cnf
View file

@ -4,7 +4,6 @@
[mysqld]
wsrep-on=1
binlog-format=row
plugin-maturity=unknown
innodb-autoinc-lock-mode=2
default-storage-engine=innodb
wsrep-provider=@ENV.WSREP_PROVIDER

1
mysql-test/suite/galera/suite.opt
View file

@ -1 +0,0 @@
--plugin-maturity=unknown

1
mysql-test/suite/galera_3nodes/galera_3nodes.cnf
View file

@ -3,7 +3,6 @@
[mysqld]
binlog-format=row
plugin-maturity=unknown
innodb-autoinc-lock-mode=2
default-storage-engine=innodb

1
mysql-test/suite/rpl/suite.opt
View file

@ -1 +0,0 @@
--plugin-maturity=unknown

1
mysql-test/suite/sys_vars/inc/sysvars_server.inc
View file

@ -26,7 +26,6 @@ select * from information_schema.system_variables
'lower_case_file_system',
'lower_case_table_names',
'open_files_limit',
'plugin_maturity',
'rand_seed1',
'rand_seed2',
'system_time_zone',

15
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View file

@ -15,7 +15,6 @@ variable_name not in (
'lower_case_file_system',
'lower_case_table_names',
'open_files_limit',
'plugin_maturity',
'rand_seed1',
'rand_seed2',
'system_time_zone',
@ -3189,6 +3188,20 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME PLUGIN_MATURITY
SESSION_VALUE NULL
GLOBAL_VALUE unknown
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE unknown
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
VARIABLE_COMMENT The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST unknown,experimental,alpha,beta,gamma,stable
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME PORT
SESSION_VALUE NULL
GLOBAL_VALUE MASTER_MYPORT

15
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file

@ -15,7 +15,6 @@ variable_name not in (
'lower_case_file_system',
'lower_case_table_names',
'open_files_limit',
'plugin_maturity',
'rand_seed1',
'rand_seed2',
'system_time_zone',
@ -3399,6 +3398,20 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME PLUGIN_MATURITY
SESSION_VALUE NULL
GLOBAL_VALUE unknown
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE unknown
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
VARIABLE_COMMENT The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST unknown,experimental,alpha,beta,gamma,stable
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME PORT
SESSION_VALUE NULL
GLOBAL_VALUE MASTER_MYPORT

2
mysql-test/t/bootstrap.test
View file

@ -7,7 +7,7 @@ drop table if exists t1;
# Add the datadir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`;
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown;
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --loose-skip-innodb;
#
# Check that --bootstrap reads from stdin
#

2
mysql-test/t/mysqld--help.test
View file

@ -19,7 +19,7 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help
perl;
# Variables which we don't want to display in the result file since
# their paths may vary:
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir plugin-maturity
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
log-slow-queries pid-file slow-query-log-file log-basename
datadir slave-load-tmpdir tmpdir socket thread-pool-size
large-files-support lower-case-file-system system-time-zone

9
sql/sql_plugin.cc
View file

@ -1155,7 +1155,6 @@ static bool plugin_add(MEM_ROOT *tmp_root,
report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, ENOEXEC, buf);
goto err;
}
if (plugin_maturity_map[plugin->maturity] < plugin_maturity)
{
char buf[256];
@ -1168,14 +1167,6 @@ static bool plugin_add(MEM_ROOT *tmp_root,
report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, EPERM, buf);
goto err;
}
else if (plugin_maturity_map[plugin->maturity] < SERVER_MATURITY_LEVEL)
{
sql_print_warning("Plugin '%s' is of maturity level %s while the server is %s",
tmp.name.str,
plugin_maturity_names[plugin->maturity],
plugin_maturity_names[SERVER_MATURITY_LEVEL]);
}
tmp.plugin= plugin;
tmp.ref_count= 0;
tmp.state= PLUGIN_IS_UNINITIALIZED;

4
sql/sys_vars.cc
View file

@ -5382,9 +5382,7 @@ static Sys_var_enum Sys_plugin_maturity(
"The lowest desirable plugin maturity. "
"Plugins less mature than that will not be installed or loaded",
READ_ONLY GLOBAL_VAR(plugin_maturity), CMD_LINE(REQUIRED_ARG),
plugin_maturity_names,
DEFAULT(SERVER_MATURITY_LEVEL > 0 ?
SERVER_MATURITY_LEVEL - 1 : SERVER_MATURITY_LEVEL));
plugin_maturity_names, DEFAULT(MariaDB_PLUGIN_MATURITY_UNKNOWN));
static Sys_var_ulong Sys_deadlock_search_depth_short(
"deadlock_search_depth_short",

3
storage/rocksdb/mysql-test/rocksdb/suite.opt
View file

@ -1 +1,2 @@
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb --plugin-maturity=unknown
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb

1
storage/rocksdb/mysql-test/rocksdb_hotbackup/suite.opt
View file

@ -1 +0,0 @@
--plugin-maturity=unknown

3
storage/rocksdb/mysql-test/rocksdb_rpl/suite.opt
View file

@ -1 +1,2 @@
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb --plugin-maturity=unknown
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb

1
storage/rocksdb/mysql-test/rocksdb_stress/suite.opt
View file

@ -1 +0,0 @@
--plugin-maturity=unknown

3
storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
View file

@ -1 +1,2 @@
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --plugin-maturity=unknown
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO

2
storage/rocksdb/mysql-test/storage_engine/suite.opt
View file

@ -1 +1 @@
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --collation-server=latin1_bin --loose-rocksdb_flush_log_at_trx_commit=0 --plugin-maturity=unknown
--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --collation-server=latin1_bin --loose-rocksdb_flush_log_at_trx_commit=0