mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 07:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2015-12-21 21:24:22 +01:00
commit a2bcee626d
3462 changed files with 635147 additions and 221404 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/suite/sys_vars/r/all_vars.result
View file

@ -10,11 +10,5 @@ there should be *no* long test name listed below:
select distinct variable_name as `there should be *no* variables listed below:` from t2
left join t1 on variable_name=test_name where test_name is null;
there should be *no* variables listed below:
encrypt_tmp_files
innodb_default_encryption_key_id
max_digest_length
strict_password_validation
wsrep_patch_version
pfs_max_digest_length
drop table t1;
drop table t2;

23
mysql-test/suite/sys_vars/r/max_digest_length_basic.result Normal file
View file

@ -0,0 +1,23 @@
select @@global.max_digest_length;
@@global.max_digest_length
1024
select @@session.max_digest_length;
ERROR HY000: Variable 'max_digest_length' is a GLOBAL variable
show global variables like 'max_digest_length';
Variable_name Value
max_digest_length 1024
show session variables like 'max_digest_length';
Variable_name Value
max_digest_length 1024
select * from information_schema.global_variables
where variable_name='max_digest_length';
VARIABLE_NAME VARIABLE_VALUE
MAX_DIGEST_LENGTH 1024
select * from information_schema.session_variables
where variable_name='max_digest_length';
VARIABLE_NAME VARIABLE_VALUE
MAX_DIGEST_LENGTH 1024
set global max_digest_length=1;
ERROR HY000: Variable 'max_digest_length' is a read only variable
set session max_digest_length=1;
ERROR HY000: Variable 'max_digest_length' is a read only variable

23
mysql-test/suite/sys_vars/r/pfs_max_digest_length_basic.result Normal file
View file

@ -0,0 +1,23 @@
select @@global.performance_schema_max_digest_length;
@@global.performance_schema_max_digest_length
1024
select @@session.performance_schema_max_digest_length;
ERROR HY000: Variable 'performance_schema_max_digest_length' is a GLOBAL variable
show global variables like 'performance_schema_max_digest_length';
Variable_name Value
performance_schema_max_digest_length 1024
show session variables like 'performance_schema_max_digest_length';
Variable_name Value
performance_schema_max_digest_length 1024
select * from information_schema.global_variables
where variable_name='performance_schema_max_digest_length';
VARIABLE_NAME VARIABLE_VALUE
PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH 1024
select * from information_schema.session_variables
where variable_name='performance_schema_max_digest_length';
VARIABLE_NAME VARIABLE_VALUE
PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH 1024
set global performance_schema_max_digest_length=1;
ERROR HY000: Variable 'performance_schema_max_digest_length' is a read only variable
set session performance_schema_max_digest_length=1;
ERROR HY000: Variable 'performance_schema_max_digest_length' is a read only variable

48
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
View file

@ -21,7 +21,7 @@
VARIABLE_NAME INNODB_ADAPTIVE_MAX_SLEEP_DELAY
SESSION_VALUE NULL
GLOBAL_VALUE 150000
@@ -341,6 +355,20 @@
@@ -355,6 +369,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -32,7 +32,7 @@
+DEFAULT_VALUE OFF
+VARIABLE_SCOPE GLOBAL
+VARIABLE_TYPE BOOLEAN
+VARIABLE_COMMENT Preallocate (pre-fault) the page frames required for the mapping established by the buffer pool memory region. Disabled by default.
+VARIABLE_COMMENT Depricated. This option is temporary alias of --innodb-numa-interleave.
+NUMERIC_MIN_VALUE NULL
+NUMERIC_MAX_VALUE NULL
+NUMERIC_BLOCK_SIZE NULL
@ -42,7 +42,7 @@
VARIABLE_NAME INNODB_BUFFER_POOL_SIZE
SESSION_VALUE NULL
GLOBAL_VALUE 8388608
@@ -432,7 +460,7 @@
@@ -446,7 +474,7 @@
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
@ -51,7 +51,7 @@
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -453,6 +481,104 @@
@@ -467,6 +495,104 @@
ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -156,7 +156,7 @@
VARIABLE_NAME INNODB_CMP_PER_INDEX_ENABLED
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -551,6 +677,20 @@
@@ -565,6 +691,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -177,7 +177,7 @@
VARIABLE_NAME INNODB_DATA_FILE_PATH
SESSION_VALUE NULL
GLOBAL_VALUE ibdata1:12M:autoextend
@@ -747,6 +887,20 @@
@@ -761,6 +901,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT OPTIONAL
@ -198,7 +198,7 @@
VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE
SESSION_VALUE NULL
GLOBAL_VALUE 1
@@ -817,6 +971,20 @@
@@ -831,6 +985,20 @@
ENUM_VALUE_LIST OFF,ON,FORCE
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
@ -219,7 +219,7 @@
VARIABLE_NAME INNODB_FAST_SHUTDOWN
SESSION_VALUE NULL
GLOBAL_VALUE 1
@@ -944,11 +1112,11 @@
@@ -958,11 +1126,11 @@
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT
@ -233,7 +233,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
NUMERIC_MIN_VALUE 0
@@ -1041,6 +1209,20 @@
@@ -1055,6 +1223,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
@ -254,7 +254,7 @@
VARIABLE_NAME INNODB_FT_AUX_TABLE
SESSION_VALUE NULL
GLOBAL_VALUE
@@ -1279,6 +1461,20 @@
@@ -1293,6 +1475,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -275,7 +275,7 @@
VARIABLE_NAME INNODB_LARGE_PREFIX
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -1307,6 +1503,20 @@
@@ -1321,6 +1517,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -296,7 +296,7 @@
VARIABLE_NAME INNODB_LOCKS_UNSAFE_FOR_BINLOG
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -1335,6 +1545,62 @@
@@ -1349,6 +1559,62 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -359,7 +359,7 @@
VARIABLE_NAME INNODB_LOG_BUFFER_SIZE
SESSION_VALUE NULL
GLOBAL_VALUE 1048576
@@ -1363,6 +1629,20 @@
@@ -1377,6 +1643,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
@ -380,7 +380,7 @@
VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -1433,6 +1713,34 @@
@@ -1447,6 +1727,34 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -415,7 +415,7 @@
VARIABLE_NAME INNODB_MAX_DIRTY_PAGES_PCT
SESSION_VALUE NULL
GLOBAL_VALUE 75.000000
@@ -1699,6 +2007,62 @@
@@ -1713,6 +2021,62 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
@ -478,7 +478,7 @@
VARIABLE_NAME INNODB_PURGE_BATCH_SIZE
SESSION_VALUE NULL
GLOBAL_VALUE 300
@@ -1867,6 +2231,48 @@
@@ -1881,6 +2245,48 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
@ -527,7 +527,7 @@
VARIABLE_NAME INNODB_SCRUB_LOG
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -1895,6 +2301,34 @@
@@ -1909,6 +2315,34 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
@ -562,7 +562,7 @@
VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES
SESSION_VALUE NULL
GLOBAL_VALUE 0
@@ -1958,7 +2392,7 @@
@@ -1972,7 +2406,7 @@
DEFAULT_VALUE nulls_equal
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
@ -571,7 +571,7 @@
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -2189,6 +2623,34 @@
@@ -2203,6 +2637,34 @@
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
@ -606,7 +606,7 @@
VARIABLE_NAME INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -2266,7 +2728,7 @@
@@ -2280,7 +2742,7 @@
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
@ -615,7 +615,7 @@
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -2287,6 +2749,20 @@
@@ -2301,6 +2763,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT NONE
@ -636,7 +636,7 @@
VARIABLE_NAME INNODB_USE_MTFLUSH
SESSION_VALUE NULL
GLOBAL_VALUE OFF
@@ -2301,6 +2777,20 @@
@@ -2315,6 +2791,20 @@
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT NONE
@ -657,12 +657,12 @@
VARIABLE_NAME INNODB_USE_SYS_MALLOC
SESSION_VALUE NULL
GLOBAL_VALUE ON
@@ -2331,12 +2821,12 @@
@@ -2345,12 +2835,12 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.27
+GLOBAL_VALUE 5.6.26-74.0
+GLOBAL_VALUE 5.6.26-76.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

46
mysql-test/suite/sys_vars/t/max_digest_length_basic.test Normal file
View file

@ -0,0 +1,46 @@
# Copyright (C) 2010 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--source include/not_embedded.inc
#
# Only global
#
select @@global.max_digest_length;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.max_digest_length;
show global variables like 'max_digest_length';
show session variables like 'max_digest_length';
select * from information_schema.global_variables
where variable_name='max_digest_length';
select * from information_schema.session_variables
where variable_name='max_digest_length';
#
# Read-only
#
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set global max_digest_length=1;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set session max_digest_length=1;

2
mysql-test/suite/sys_vars/t/pfs_max_digest_length-master_basic.opt Normal file
View file

@ -0,0 +1,2 @@
--loose-enable-performance-schema
--loose-performance-schema-max_digest_length=1024

47
mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic.test Normal file
View file

@ -0,0 +1,47 @@
# Copyright (C) 2010 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--source include/not_embedded.inc
--source include/have_perfschema.inc
#
# Only global
#
select @@global.performance_schema_max_digest_length;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.performance_schema_max_digest_length;
show global variables like 'performance_schema_max_digest_length';
show session variables like 'performance_schema_max_digest_length';
select * from information_schema.global_variables
where variable_name='performance_schema_max_digest_length';
select * from information_schema.session_variables
where variable_name='performance_schema_max_digest_length';
#
# Read-only
#
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set global performance_schema_max_digest_length=1;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set session performance_schema_max_digest_length=1;