mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Conflicts: storage/xtradb/handler/ha_innodb.cc
This commit is contained in:
Jan Lindström
@ -1900,7 +1900,7 @@ sub collect_mysqld_features {
|
||||
# they are listed in the --help output as
|
||||
# --archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON, OFF, FORCE (don't start if the plugin fails to load).
|
||||
push @optional_plugins, $1
|
||||
if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. Possible values are ON, OFF, FORCE/;
|
||||
if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. One of: ON, OFF, FORCE/;
|
||||
next;
|
||||
}
|
||||
|
||||
|
||||
@ -656,7 +656,7 @@ test.t2 984116287
|
||||
drop table t1, t2;
|
||||
show variables like 'myisam_stats_method';
|
||||
Variable_name Value
|
||||
myisam_stats_method nulls_unequal
|
||||
myisam_stats_method NULLS_UNEQUAL
|
||||
create table t1 (a int, key(a));
|
||||
insert into t1 values (0),(1),(2),(3),(4);
|
||||
insert into t1 select NULL from t1;
|
||||
@ -677,7 +677,7 @@ t1 1 a 1 a A 10 NULL NULL YES BTREE
|
||||
set myisam_stats_method=nulls_equal;
|
||||
show variables like 'myisam_stats_method';
|
||||
Variable_name Value
|
||||
myisam_stats_method nulls_equal
|
||||
myisam_stats_method NULLS_EQUAL
|
||||
insert into t1 values (11);
|
||||
delete from t1 where a=11;
|
||||
analyze table t1;
|
||||
@ -697,7 +697,7 @@ t1 1 a 1 a A 5 NULL NULL YES BTREE
|
||||
set myisam_stats_method=DEFAULT;
|
||||
show variables like 'myisam_stats_method';
|
||||
Variable_name Value
|
||||
myisam_stats_method nulls_unequal
|
||||
myisam_stats_method NULLS_UNEQUAL
|
||||
insert into t1 values (11);
|
||||
delete from t1 where a=11;
|
||||
analyze table t1;
|
||||
@ -718,7 +718,7 @@ drop table t1;
|
||||
set myisam_stats_method=nulls_ignored;
|
||||
show variables like 'myisam_stats_method';
|
||||
Variable_name Value
|
||||
myisam_stats_method nulls_ignored
|
||||
myisam_stats_method NULLS_IGNORED
|
||||
create table t1 (
|
||||
a char(3), b char(4), c char(5), d char(6),
|
||||
key(a,b,c,d)
|
||||
|
||||
@ -39,8 +39,7 @@ The following options may be given as the first argument:
|
||||
increase this to get more performance
|
||||
--binlog-checksum=name
|
||||
Type of BINLOG_CHECKSUM_ALG. Include checksum for log
|
||||
events in the binary log. Possible values are NONE and
|
||||
CRC32; default is NONE.
|
||||
events in the binary log. One of: NONE, CRC32
|
||||
--binlog-commit-wait-count=#
|
||||
If non-zero, binlog write will wait at most
|
||||
binlog_commit_wait_usec microseconds for at least this
|
||||
@ -71,10 +70,7 @@ The following options may be given as the first argument:
|
||||
statements where only row-based is correct: those which
|
||||
involve user-defined functions (i.e. UDFs) or the UUID()
|
||||
function; for those, row-based binary logging is
|
||||
automatically used. If NDBCLUSTER is enabled and
|
||||
binlog-format is MIXED, the format switches to row-based
|
||||
and back implicitly per each query accessing an
|
||||
NDBCLUSTER table
|
||||
automatically used.
|
||||
--binlog-ignore-db=name
|
||||
Tells the master that updates to the given database
|
||||
should not be logged to the binary log.
|
||||
@ -114,11 +110,11 @@ The following options may be given as the first argument:
|
||||
--collation-server=name
|
||||
Set the default collation.
|
||||
--completion-type=name
|
||||
The transaction completion type, one of NO_CHAIN, CHAIN,
|
||||
The transaction completion type. One of: NO_CHAIN, CHAIN,
|
||||
RELEASE
|
||||
--concurrent-insert[=name]
|
||||
Use concurrent insert with MyISAM. Possible values are
|
||||
NEVER, AUTO, ALWAYS
|
||||
Use concurrent insert with MyISAM. One of: NEVER, AUTO,
|
||||
ALWAYS
|
||||
--console Write error output on screen; don't remove the console
|
||||
window on windows.
|
||||
--core-file Write core on errors.
|
||||
@ -137,9 +133,8 @@ The following options may be given as the first argument:
|
||||
Short timeout for the two-step deadlock detection (in
|
||||
microseconds)
|
||||
--default-regex-flags=name
|
||||
Default flags for the regex library. Syntax:
|
||||
default-regex-flags='[flag[,flag[,flag...]]]'. See the
|
||||
manual for the complete list of valid flags
|
||||
Default flags for the regex library. Any combination of:
|
||||
DOTALL, DUPNAMES, EXTENDED, EXTRA, MULTILINE, UNGREEDY
|
||||
--default-storage-engine=name
|
||||
The default storage engine for new tables
|
||||
--default-time-zone=name
|
||||
@ -150,7 +145,7 @@ The following options may be given as the first argument:
|
||||
--default-week-format=#
|
||||
The default week format used by WEEK() functions
|
||||
--delay-key-write[=name]
|
||||
Type of DELAY_KEY_WRITE
|
||||
Type of DELAY_KEY_WRITE. One of: OFF, ON, ALL
|
||||
--delayed-insert-limit=#
|
||||
After inserting delayed_insert_limit rows, the INSERT
|
||||
DELAYED handler will check if there are any SELECT
|
||||
@ -252,7 +247,7 @@ The following options may be given as the first argument:
|
||||
(unless the user has SUPER privilege)
|
||||
--init-file=name Read SQL commands from this file at startup
|
||||
--init-rpl-role=name
|
||||
Set the replication role.
|
||||
Set the replication role. One of: MASTER, SLAVE
|
||||
--init-slave=name Command(s) that are executed by a slave server each time
|
||||
the SQL thread starts
|
||||
--interactive-timeout=#
|
||||
@ -329,8 +324,8 @@ The following options may be given as the first argument:
|
||||
not specified then 'datadir'/'log-basename'.err or the
|
||||
'pid-file' path with extension .err is used
|
||||
--log-isam[=name] Log all MyISAM changes to file.
|
||||
--log-output=name Syntax: log-output=value[,value...], where "value" could
|
||||
be TABLE, FILE or NONE
|
||||
--log-output=name How logs should be written. Any combination of: NONE,
|
||||
FILE, TABLE
|
||||
--log-queries-not-using-indexes
|
||||
Log queries that are executed without benefit of any
|
||||
index to the slow log if it is open
|
||||
@ -343,10 +338,9 @@ The following options may be given as the first argument:
|
||||
Log slow OPTIMIZE, ANALYZE, ALTER and other
|
||||
administrative statements to the slow log if it is open.
|
||||
--log-slow-filter=name
|
||||
Log only certain types of queries. Multiple flags can be
|
||||
specified, separated by commas. Valid values are admin,
|
||||
slave, filesort, filesort_on_disk, full_join, full_scan,
|
||||
query_cache, query_cache_miss, tmp_table,
|
||||
Log only certain types of queries. Any combination of:
|
||||
admin, filesort, filesort_on_disk, full_join, full_scan,
|
||||
query_cache, query_cache_miss, tmp_table,
|
||||
tmp_table_on_disk
|
||||
--log-slow-rate-limit=#
|
||||
Write to slow log every #th slow query. Set to 1 to log
|
||||
@ -356,8 +350,8 @@ The following options may be given as the first argument:
|
||||
Log slow statements executed by slave thread to the slow
|
||||
log if it is open.
|
||||
--log-slow-verbosity=name
|
||||
log-slow-verbosity=[value[,value ...]] where value is one
|
||||
of 'innodb', 'query_plan', 'explain'
|
||||
Verbosity level for the slow log. Any combination of:
|
||||
innodb, query_plan, explain
|
||||
--log-tc=name Path to transaction coordinator log (used for
|
||||
transactions that affect more than one storage engine,
|
||||
when binary log is disabled).
|
||||
@ -458,9 +452,9 @@ The following options may be given as the first argument:
|
||||
Restricts the total memory used for memory mapping of
|
||||
MySQL tables
|
||||
--myisam-recover-options[=name]
|
||||
Syntax: myisam-recover-options[=option[,option...]],
|
||||
where option can be DEFAULT, BACKUP, BACKUP_ALL, FORCE,
|
||||
QUICK, or OFF
|
||||
Specifies how corrupted tables should be automatically
|
||||
repaired. Any combination of: DEFAULT, BACKUP, FORCE,
|
||||
QUICK, BACKUP_ALL, OFF
|
||||
--myisam-repair-threads=#
|
||||
If larger than 1, when repairing a MyISAM table all
|
||||
indexes will be created in parallel, with one thread per
|
||||
@ -489,8 +483,9 @@ The following options may be given as the first argument:
|
||||
See also --old-mode
|
||||
--old-alter-table Use old, non-optimized alter table
|
||||
--old-mode=name Used to emulate old behavior from earlier MariaDB or
|
||||
MySQL versions. Syntax: old_mode=mode[,mode[,mode...]].
|
||||
See the manual for the complete list of valid old modes
|
||||
MySQL versions. Any combination of:
|
||||
NO_DUP_KEY_WARNINGS_WITH_IGNORE, NO_PROGRESS_INFO,
|
||||
ZERO_DATE_TIME_CAST
|
||||
--old-passwords Use old password encryption method (needed for 4.0 and
|
||||
older clients)
|
||||
--old-style-user-limits
|
||||
@ -524,19 +519,20 @@ The following options may be given as the first argument:
|
||||
Controls number of record samples to check condition
|
||||
selectivity
|
||||
--optimizer-switch=name
|
||||
optimizer_switch=option=val[,option=val...], where option
|
||||
is one of {derived_merge, derived_with_keys, firstmatch,
|
||||
in_to_exists, engine_condition_pushdown,
|
||||
index_condition_pushdown, index_merge,
|
||||
index_merge_intersection, index_merge_sort_intersection,
|
||||
index_merge_sort_union, index_merge_union,
|
||||
join_cache_bka, join_cache_hashed,
|
||||
join_cache_incremental, loosescan, materialization, mrr,
|
||||
mrr_cost_based, mrr_sort_keys, optimize_join_buffer_size,
|
||||
outer_join_with_cache, partial_match_rowid_merge,
|
||||
partial_match_table_scan, semijoin, semijoin_with_cache,
|
||||
subquery_cache, table_elimination, extended_keys,
|
||||
exists_to_in } and val is one of {on, off, default}
|
||||
Fine-tune the optimizer behavior. Takes a comma-separated
|
||||
list of option=value pairs, where value is on, off, or
|
||||
default, and options are: index_merge, index_merge_union,
|
||||
index_merge_sort_union, index_merge_intersection,
|
||||
index_merge_sort_intersection, engine_condition_pushdown,
|
||||
index_condition_pushdown, derived_merge,
|
||||
derived_with_keys, firstmatch, loosescan, materialization,
|
||||
in_to_exists, semijoin, partial_match_rowid_merge,
|
||||
partial_match_table_scan, subquery_cache, mrr,
|
||||
mrr_cost_based, mrr_sort_keys, outer_join_with_cache,
|
||||
semijoin_with_cache, join_cache_incremental,
|
||||
join_cache_hashed, join_cache_bka,
|
||||
optimize_join_buffer_size, table_elimination,
|
||||
extended_keys, exists_to_in
|
||||
--optimizer-use-condition-selectivity=#
|
||||
Controls selectivity of which conditions the optimizer
|
||||
takes into account to calculate cardinality of a partial
|
||||
@ -689,9 +685,9 @@ The following options may be given as the first argument:
|
||||
in an incremental way. It can be specified many times,
|
||||
adding more plugins every time.
|
||||
--plugin-maturity=name
|
||||
The lowest desirable plugin maturity (unknown,
|
||||
experimental, alpha, beta, gamma, or stable). Plugins
|
||||
less mature than that will not be installed or loaded.
|
||||
The lowest desirable plugin maturity. Plugins less mature
|
||||
than that will not be installed or loaded. One of:
|
||||
unknown, experimental, alpha, beta, gamma, stable
|
||||
-P, --port=# Port number to use for connection or 0 to default to,
|
||||
my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default
|
||||
(3306), whatever comes first
|
||||
@ -934,11 +930,10 @@ The following options may be given as the first argument:
|
||||
transaction in case it failed with a deadlock or elapsed
|
||||
lock wait timeout, before giving up and stopping
|
||||
--slave-type-conversions=name
|
||||
Set of slave type conversions that are enabled. Legal
|
||||
values are: ALL_LOSSY to enable lossy conversions and
|
||||
ALL_NON_LOSSY to enable non-lossy conversions. If the
|
||||
variable is assigned the empty set, no conversions are
|
||||
allowed and it is expected that the types match exactly.
|
||||
Set of slave type conversions that are enabled. If the
|
||||
variable is empty, no conversions are allowed and it is
|
||||
expected that the types match exactly. Any combination
|
||||
of: ALL_LOSSY, ALL_NON_LOSSY
|
||||
--slow-launch-time=#
|
||||
If creating the thread takes longer than this value (in
|
||||
seconds), the Slow_launch_threads counter will be
|
||||
@ -955,8 +950,18 @@ The following options may be given as the first argument:
|
||||
--sort-buffer-size=#
|
||||
Each thread that needs to do a sort allocates a buffer of
|
||||
this size
|
||||
--sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
|
||||
for the complete list of valid sql modes
|
||||
--sql-mode=name Sets the sql mode. Any combination of: REAL_AS_FLOAT,
|
||||
PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE,
|
||||
IGNORE_BAD_TABLE_OPTIONS, ONLY_FULL_GROUP_BY,
|
||||
NO_UNSIGNED_SUBTRACTION, NO_DIR_IN_CREATE, POSTGRESQL,
|
||||
ORACLE, MSSQL, DB2, MAXDB, NO_KEY_OPTIONS,
|
||||
NO_TABLE_OPTIONS, NO_FIELD_OPTIONS, MYSQL323, MYSQL40,
|
||||
ANSI, NO_AUTO_VALUE_ON_ZERO, NO_BACKSLASH_ESCAPES,
|
||||
STRICT_TRANS_TABLES, STRICT_ALL_TABLES, NO_ZERO_IN_DATE,
|
||||
NO_ZERO_DATE, ALLOW_INVALID_DATES,
|
||||
ERROR_FOR_DIVISION_BY_ZERO, TRADITIONAL,
|
||||
NO_AUTO_CREATE_USER, HIGH_NOT_PRECEDENCE,
|
||||
NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
|
||||
--stack-trace Print a symbolic stack trace on failure
|
||||
(Defaults to on; use --skip-stack-trace to disable.)
|
||||
--stored-program-cache=#
|
||||
@ -987,8 +992,8 @@ The following options may be given as the first argument:
|
||||
--table-open-cache=#
|
||||
The number of cached open tables
|
||||
--tc-heuristic-recover=name
|
||||
Decision to use in heuristic recover process. Possible
|
||||
values are COMMIT or ROLLBACK.
|
||||
Decision to use in heuristic recover process. One of:
|
||||
COMMIT, ROLLBACK
|
||||
--thread-cache-size=#
|
||||
How many threads we should keep in a cache for reuse
|
||||
--thread-pool-idle-timeout=#
|
||||
@ -1024,7 +1029,9 @@ The following options may be given as the first argument:
|
||||
Allocation block size for transactions to be stored in
|
||||
binary log
|
||||
--transaction-isolation=name
|
||||
Default transaction isolation level.
|
||||
Default transaction isolation level. One of:
|
||||
READ-UNCOMMITTED, READ-COMMITTED, REPEATABLE-READ,
|
||||
SERIALIZABLE
|
||||
--transaction-prealloc-size=#
|
||||
Persistent buffer for transactions to be stored in binary
|
||||
log
|
||||
@ -1039,8 +1046,8 @@ The following options may be given as the first argument:
|
||||
of the underlying table and the query uses a LIMIT clause
|
||||
(usually get from GUI tools)
|
||||
--use-stat-tables=name
|
||||
Specifies how to use system statistics tables. Possible
|
||||
values are NEVER, COMPLEMENTARY, PREFERABLY
|
||||
Specifies how to use system statistics tables. One of:
|
||||
NEVER, COMPLEMENTARY, PREFERABLY
|
||||
-u, --user=name Run mysqld daemon as user.
|
||||
--userstat Enables statistics gathering for USER_STATISTICS,
|
||||
CLIENT_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS
|
||||
@ -1196,7 +1203,7 @@ myisam-mmap-size 18446744073709551615
|
||||
myisam-recover-options DEFAULT
|
||||
myisam-repair-threads 1
|
||||
myisam-sort-buffer-size 134216704
|
||||
myisam-stats-method nulls_unequal
|
||||
myisam-stats-method NULLS_UNEQUAL
|
||||
myisam-use-mmap FALSE
|
||||
net-buffer-length 16384
|
||||
net-read-timeout 30
|
||||
@ -1282,7 +1289,7 @@ relay-log-purge TRUE
|
||||
relay-log-recovery FALSE
|
||||
relay-log-space-limit 0
|
||||
replicate-annotate-row-events FALSE
|
||||
replicate-events-marked-for-skip replicate
|
||||
replicate-events-marked-for-skip REPLICATE
|
||||
replicate-same-server-id FALSE
|
||||
report-host (No default value)
|
||||
report-password (No default value)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
call mtr.add_suppression("Can't open and lock privilege tables: Table 'host' was not locked with LOCK TABLES");
|
||||
call mtr.add_suppression("Can't open and lock privilege tables: Table 'user' was not locked with LOCK TABLES");
|
||||
SHOW VARIABLES like 'slave_skip_errors';
|
||||
Variable_name Value
|
||||
slave_skip_errors OFF
|
||||
@ -16,7 +16,7 @@ DROP TABLE IF EXISTS t1;
|
||||
CREATE TABLE t1 (c1 INT);
|
||||
LOCK TABLES t1 READ;
|
||||
FLUSH PRIVILEGES;
|
||||
ERROR HY000: Table 'host' was not locked with LOCK TABLES
|
||||
ERROR HY000: Table 'user' was not locked with LOCK TABLES
|
||||
UNLOCK TABLES;
|
||||
DROP TABLE t1;
|
||||
#
|
||||
|
||||
@ -128,11 +128,8 @@ CREATE FUNCTION f1() RETURNS INT RETURN 1;
|
||||
RENAME TABLE mysql.procs_priv TO procs_priv_backup;
|
||||
FLUSH TABLE mysql.procs_priv;
|
||||
DROP FUNCTION f1;
|
||||
ERROR 42S02: Table 'mysql.procs_priv' doesn't exist
|
||||
SHOW WARNINGS;
|
||||
Level Code Message
|
||||
Error 1146 Table 'mysql.procs_priv' doesn't exist
|
||||
Warning 1405 Failed to revoke all privileges to dropped routine
|
||||
# Restore the procs_priv table
|
||||
RENAME TABLE procs_priv_backup TO mysql.procs_priv;
|
||||
FLUSH TABLE mysql.procs_priv;
|
||||
|
||||
20
mysql-test/r/temp_table_frm.result
Normal file
20
mysql-test/r/temp_table_frm.result
Normal file
@ -0,0 +1,20 @@
|
||||
create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
|
||||
create temporary table t2 (a int) engine=memory;
|
||||
select variable_name, session_status.variable_value - t1.variable_value
|
||||
from information_schema.session_status join t1 using (variable_name);
|
||||
variable_name session_status.variable_value - t1.variable_value
|
||||
OPENED_FILES 0
|
||||
OPENED_PLUGIN_LIBRARIES 0
|
||||
OPENED_TABLE_DEFINITIONS 2
|
||||
OPENED_TABLES 2
|
||||
OPENED_VIEWS 0
|
||||
truncate table t2;
|
||||
select variable_name, session_status.variable_value - t1.variable_value
|
||||
from information_schema.session_status join t1 using (variable_name);
|
||||
variable_name session_status.variable_value - t1.variable_value
|
||||
OPENED_FILES 0
|
||||
OPENED_PLUGIN_LIBRARIES 0
|
||||
OPENED_TABLE_DEFINITIONS 2
|
||||
OPENED_TABLES 2
|
||||
OPENED_VIEWS 0
|
||||
drop table t1;
|
||||
@ -8,22 +8,22 @@ ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) fo
|
||||
DROP USER'nonsuperuser'@'127.0.0.1';
|
||||
SELECT @@global.replicate_events_marked_for_skip;
|
||||
@@global.replicate_events_marked_for_skip
|
||||
replicate
|
||||
REPLICATE
|
||||
SET GLOBAL replicate_events_marked_for_skip=FILTER_ON_SLAVE;
|
||||
ERROR HY000: This operation cannot be performed as you have a running slave ''; run STOP SLAVE '' first
|
||||
SELECT @@global.replicate_events_marked_for_skip;
|
||||
@@global.replicate_events_marked_for_skip
|
||||
replicate
|
||||
REPLICATE
|
||||
STOP SLAVE;
|
||||
SET SESSION replicate_events_marked_for_skip=FILTER_ON_MASTER;
|
||||
ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable and should be set with SET GLOBAL
|
||||
SELECT @@global.replicate_events_marked_for_skip;
|
||||
@@global.replicate_events_marked_for_skip
|
||||
replicate
|
||||
REPLICATE
|
||||
SET GLOBAL replicate_events_marked_for_skip=FILTER_ON_MASTER;
|
||||
SELECT @@global.replicate_events_marked_for_skip;
|
||||
@@global.replicate_events_marked_for_skip
|
||||
filter_on_master
|
||||
FILTER_ON_MASTER
|
||||
START SLAVE;
|
||||
SELECT @@skip_replication;
|
||||
@@skip_replication
|
||||
|
||||
@ -1,47 +1,47 @@
|
||||
SET @orig = @@global.innodb_checksum_algorithm;
|
||||
SELECT @orig;
|
||||
@orig
|
||||
innodb
|
||||
INNODB
|
||||
SET GLOBAL innodb_checksum_algorithm = 'crc32';
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
crc32
|
||||
CRC32
|
||||
SET GLOBAL innodb_checksum_algorithm = 'strict_crc32';
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
strict_crc32
|
||||
STRICT_CRC32
|
||||
SET GLOBAL innodb_checksum_algorithm = 'innodb';
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
innodb
|
||||
INNODB
|
||||
SET GLOBAL innodb_checksum_algorithm = 'strict_innodb';
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
strict_innodb
|
||||
STRICT_INNODB
|
||||
SET GLOBAL innodb_checksum_algorithm = 'none';
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
none
|
||||
NONE
|
||||
SET GLOBAL innodb_checksum_algorithm = 'strict_none';
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_checksum_algorithm = '';
|
||||
ERROR 42000: Variable 'innodb_checksum_algorithm' can't be set to the value of ''
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_checksum_algorithm = 'foobar';
|
||||
ERROR 42000: Variable 'innodb_checksum_algorithm' can't be set to the value of 'foobar'
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_checksum_algorithm = 123;
|
||||
ERROR 42000: Variable 'innodb_checksum_algorithm' can't be set to the value of '123'
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_checksum_algorithm = @orig;
|
||||
SELECT @@global.innodb_checksum_algorithm;
|
||||
@@global.innodb_checksum_algorithm
|
||||
innodb
|
||||
INNODB
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
SET @start_value = @@GLOBAL.innodb_cleaner_lsn_age_factor;
|
||||
SELECT @@GLOBAL.innodb_cleaner_lsn_age_factor;
|
||||
@@GLOBAL.innodb_cleaner_lsn_age_factor
|
||||
high_checkpoint
|
||||
HIGH_CHECKPOINT
|
||||
SELECT @@SESSION.innodb_cleaner_lsn_age_factor;
|
||||
ERROR HY000: Variable 'innodb_cleaner_lsn_age_factor' is a GLOBAL variable
|
||||
SET GLOBAL innodb_cleaner_lsn_age_factor='legacy';
|
||||
SELECT @@GLOBAL.innodb_cleaner_lsn_age_factor;
|
||||
@@GLOBAL.innodb_cleaner_lsn_age_factor
|
||||
legacy
|
||||
LEGACY
|
||||
SET GLOBAL innodb_cleaner_lsn_age_factor='high_checkpoint';
|
||||
SELECT @@GLOBAL.innodb_cleaner_lsn_age_factor;
|
||||
@@GLOBAL.innodb_cleaner_lsn_age_factor
|
||||
high_checkpoint
|
||||
HIGH_CHECKPOINT
|
||||
SET GLOBAL innodb_cleaner_lsn_age_factor=1.1;
|
||||
ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_lsn_age_factor'
|
||||
SET GLOBAL innodb_cleaner_lsn_age_factor=1e1;
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
SET @start_value = @@GLOBAL.innodb_empty_free_list_algorithm;
|
||||
SELECT @@GLOBAL.innodb_empty_free_list_algorithm;
|
||||
@@GLOBAL.innodb_empty_free_list_algorithm
|
||||
backoff
|
||||
BACKOFF
|
||||
SELECT @@SESSION.innodb_empty_free_list_algorithm;
|
||||
ERROR HY000: Variable 'innodb_empty_free_list_algorithm' is a GLOBAL variable
|
||||
SET GLOBAL innodb_empty_free_list_algorithm='legacy';
|
||||
SELECT @@GLOBAL.innodb_empty_free_list_algorithm;
|
||||
@@GLOBAL.innodb_empty_free_list_algorithm
|
||||
legacy
|
||||
LEGACY
|
||||
SET GLOBAL innodb_empty_free_list_algorithm='backoff';
|
||||
SELECT @@GLOBAL.innodb_empty_free_list_algorithm;
|
||||
@@GLOBAL.innodb_empty_free_list_algorithm
|
||||
backoff
|
||||
BACKOFF
|
||||
SET GLOBAL innodb_empty_free_list_algorithm=1.1;
|
||||
ERROR 42000: Incorrect argument type to variable 'innodb_empty_free_list_algorithm'
|
||||
SET GLOBAL innodb_empty_free_list_algorithm=1e1;
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
SET @start_value = @@GLOBAL.innodb_foreground_preflush;
|
||||
SELECT @@GLOBAL.innodb_foreground_preflush;
|
||||
@@GLOBAL.innodb_foreground_preflush
|
||||
exponential_backoff
|
||||
EXPONENTIAL_BACKOFF
|
||||
SELECT @@SESSION.innodb_foreground_preflush;
|
||||
ERROR HY000: Variable 'innodb_foreground_preflush' is a GLOBAL variable
|
||||
SET GLOBAL innodb_foreground_preflush='sync_preflush';
|
||||
SELECT @@GLOBAL.innodb_foreground_preflush;
|
||||
@@GLOBAL.innodb_foreground_preflush
|
||||
sync_preflush
|
||||
SYNC_PREFLUSH
|
||||
SET GLOBAL innodb_foreground_preflush='exponential_backoff';
|
||||
SELECT @@GLOBAL.innodb_foreground_preflush;
|
||||
@@GLOBAL.innodb_foreground_preflush
|
||||
exponential_backoff
|
||||
EXPONENTIAL_BACKOFF
|
||||
SET GLOBAL innodb_foreground_preflush=1.1;
|
||||
ERROR 42000: Incorrect argument type to variable 'innodb_foreground_preflush'
|
||||
SET GLOBAL innodb_foreground_preflush=1e1;
|
||||
|
||||
@ -1,47 +1,47 @@
|
||||
SET @orig = @@global.innodb_log_checksum_algorithm;
|
||||
SELECT @orig;
|
||||
@orig
|
||||
innodb
|
||||
INNODB
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'crc32';
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
crc32
|
||||
CRC32
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'strict_crc32';
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
strict_crc32
|
||||
STRICT_CRC32
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'innodb';
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
innodb
|
||||
INNODB
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'strict_innodb';
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
strict_innodb
|
||||
STRICT_INNODB
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'none';
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
none
|
||||
NONE
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'strict_none';
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_log_checksum_algorithm = '';
|
||||
ERROR 42000: Variable 'innodb_log_checksum_algorithm' can't be set to the value of ''
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 'foobar';
|
||||
ERROR 42000: Variable 'innodb_log_checksum_algorithm' can't be set to the value of 'foobar'
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_log_checksum_algorithm = 123;
|
||||
ERROR 42000: Variable 'innodb_log_checksum_algorithm' can't be set to the value of '123'
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
strict_none
|
||||
STRICT_NONE
|
||||
SET GLOBAL innodb_log_checksum_algorithm = @orig;
|
||||
SELECT @@global.innodb_log_checksum_algorithm;
|
||||
@@global.innodb_log_checksum_algorithm
|
||||
innodb
|
||||
INNODB
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
SET @global_start_value = @@global.myisam_stats_method;
|
||||
SELECT @global_start_value;
|
||||
@global_start_value
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
SET @session_start_value = @@session.myisam_stats_method;
|
||||
SELECT @session_start_value;
|
||||
@session_start_value
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
'#--------------------FN_DYNVARS_097_01------------------------#'
|
||||
SET @@global.myisam_stats_method = nulls_equal;
|
||||
SET @@global.myisam_stats_method = DEFAULT;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
SET @@session.myisam_stats_method = nulls_equal;
|
||||
SET @@session.myisam_stats_method = DEFAULT;
|
||||
SELECT @@session.myisam_stats_method;
|
||||
@@session.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
'#---------------------FN_DYNVARS_097_02-------------------------#'
|
||||
SET @@global.myisam_stats_method = NULL;
|
||||
ERROR 42000: Variable 'myisam_stats_method' can't be set to the value of 'NULL'
|
||||
@ -30,28 +30,28 @@ ERROR 42000: Variable 'myisam_stats_method' can't be set to the value of ''
|
||||
SET @@global.myisam_stats_method = 'nulls_equal';
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SET @@global.myisam_stats_method = 'nulls_unequal';
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
SET @@global.myisam_stats_method = 'nulls_ignored';
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_ignored
|
||||
NULLS_IGNORED
|
||||
'Bug: Value of nulls_ignored is not documented. Its ordinal value is 2'
|
||||
SET @@session.myisam_stats_method = 'nulls_equal';
|
||||
SELECT @@session.myisam_stats_method;
|
||||
@@session.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SET @@session.myisam_stats_method = 'nulls_unequal';
|
||||
SELECT @@session.myisam_stats_method;
|
||||
@@session.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
SET @@session.myisam_stats_method = 'nulls_ignored';
|
||||
SELECT @@session.myisam_stats_method;
|
||||
@@session.myisam_stats_method
|
||||
nulls_ignored
|
||||
NULLS_IGNORED
|
||||
'#--------------------FN_DYNVARS_097_04-------------------------#'
|
||||
SET @@global.myisam_stats_method = -1;
|
||||
ERROR 42000: Variable 'myisam_stats_method' can't be set to the value of '-1'
|
||||
@ -81,15 +81,15 @@ WHERE VARIABLE_NAME='myisam_stats_method';
|
||||
SET @@global.myisam_stats_method = 0;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
SET @@global.myisam_stats_method = 1;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SET @@global.myisam_stats_method = 2;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_ignored
|
||||
NULLS_IGNORED
|
||||
SET @@global.myisam_stats_method = 0.4;
|
||||
ERROR 42000: Incorrect argument type to variable 'myisam_stats_method'
|
||||
SET @@global.myisam_stats_method = 3;
|
||||
@ -98,11 +98,11 @@ ERROR 42000: Variable 'myisam_stats_method' can't be set to the value of '3'
|
||||
SET @@global.myisam_stats_method = TRUE;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SET @@global.myisam_stats_method = FALSE;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
'#---------------------FN_DYNVARS_097_09----------------------#'
|
||||
SET myisam_stats_method = 'nulls_equal';
|
||||
SET session.myisam_stats_method = 'nulls_equal';
|
||||
@ -112,16 +112,16 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
|
||||
SET session myisam_stats_method = 'nulls_equal';
|
||||
SELECT @@myisam_stats_method;
|
||||
@@myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SET global myisam_stats_method = 'nulls_equal';
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SET @@global.myisam_stats_method = @global_start_value;
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
SET @@session.myisam_stats_method = @session_start_value;
|
||||
SELECT @@session.myisam_stats_method;
|
||||
@@session.myisam_stats_method
|
||||
nulls_unequal
|
||||
NULLS_UNEQUAL
|
||||
|
||||
@ -5,10 +5,10 @@ SET @@global.myisam_stats_method = nulls_equal;
|
||||
'connection con1'
|
||||
SELECT @@global.myisam_stats_method;
|
||||
@@global.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
SELECT @@session.myisam_stats_method;
|
||||
@@session.myisam_stats_method
|
||||
nulls_equal
|
||||
NULLS_EQUAL
|
||||
'#--------------------FN_DYNVARS_097_02-------------------------#'
|
||||
'connection default'
|
||||
DROP TABLE IF EXISTS t1;
|
||||
@ -53,7 +53,7 @@ t1 1 a 1 a A 5 NULL NULL YES BTREE
|
||||
SET myisam_stats_method = nulls_ignored;
|
||||
SHOW VARIABLES LIKE 'myisam_stats_method';
|
||||
Variable_name Value
|
||||
myisam_stats_method nulls_ignored
|
||||
myisam_stats_method NULLS_IGNORED
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (
|
||||
a CHAR(3), b CHAR(4), c CHAR(5), d CHAR(6),
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
SET @save_replicate_events_marked_for_skip = @@GLOBAL.replicate_events_marked_for_skip;
|
||||
SELECT @save_replicate_events_marked_for_skip;
|
||||
@save_replicate_events_marked_for_skip
|
||||
replicate
|
||||
REPLICATE
|
||||
# Scope.
|
||||
SET @@SESSION.replicate_events_marked_for_skip = "";
|
||||
ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable and should be set with SET GLOBAL
|
||||
@ -14,22 +14,22 @@ ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable
|
||||
SET @@GLOBAL.replicate_events_marked_for_skip=filter_on_master;
|
||||
SELECT @@GLOBAL.replicate_events_marked_for_skip;
|
||||
@@GLOBAL.replicate_events_marked_for_skip
|
||||
filter_on_master
|
||||
FILTER_ON_MASTER
|
||||
SET @@GLOBAL.replicate_events_marked_for_skip=filter_on_slave;
|
||||
SELECT @@GLOBAL.replicate_events_marked_for_skip;
|
||||
@@GLOBAL.replicate_events_marked_for_skip
|
||||
filter_on_slave
|
||||
FILTER_ON_SLAVE
|
||||
SET @@GLOBAL.replicate_events_marked_for_skip=replicate;
|
||||
SELECT @@GLOBAL.replicate_events_marked_for_skip;
|
||||
@@GLOBAL.replicate_events_marked_for_skip
|
||||
replicate
|
||||
REPLICATE
|
||||
SET @@GLOBAL.replicate_events_marked_for_skip=filter;
|
||||
ERROR 42000: Variable 'replicate_events_marked_for_skip' can't be set to the value of 'filter'
|
||||
SELECT @@GLOBAL.replicate_events_marked_for_skip;
|
||||
@@GLOBAL.replicate_events_marked_for_skip
|
||||
replicate
|
||||
REPLICATE
|
||||
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_events_marked_for_skip';
|
||||
VARIABLE_NAME VARIABLE_VALUE
|
||||
REPLICATE_EVENTS_MARKED_FOR_SKIP replicate
|
||||
REPLICATE_EVENTS_MARKED_FOR_SKIP REPLICATE
|
||||
# Cleanup.
|
||||
SET @@GLOBAL.replicate_events_marked_for_skip = @save_replicate_events_marked_for_skip;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
# End of 4.1 tests
|
||||
|
||||
call mtr.add_suppression("Can't open and lock privilege tables: Table 'host' was not locked with LOCK TABLES");
|
||||
call mtr.add_suppression("Can't open and lock privilege tables: Table 'user' was not locked with LOCK TABLES");
|
||||
|
||||
#
|
||||
# Bug#43835: SHOW VARIABLES does not include 0 for slave_skip_errors
|
||||
|
||||
@ -214,7 +214,6 @@ RENAME TABLE mysql.procs_priv TO procs_priv_backup;
|
||||
FLUSH TABLE mysql.procs_priv;
|
||||
|
||||
# DROP FUNCTION used to cause an assert.
|
||||
--error ER_NO_SUCH_TABLE
|
||||
DROP FUNCTION f1;
|
||||
SHOW WARNINGS;
|
||||
|
||||
|
||||
13
mysql-test/t/temp_table_frm.test
Normal file
13
mysql-test/t/temp_table_frm.test
Normal file
@ -0,0 +1,13 @@
|
||||
#
|
||||
# MDEV-4260 Don't create frm files for temporary tables
|
||||
#
|
||||
create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
|
||||
create temporary table t2 (a int) engine=memory;
|
||||
select variable_name, session_status.variable_value - t1.variable_value
|
||||
from information_schema.session_status join t1 using (variable_name);
|
||||
let $tmpdir= `select @@tmpdir`;
|
||||
--list_files $tmpdir/ #sql*
|
||||
truncate table t2;
|
||||
select variable_name, session_status.variable_value - t1.variable_value
|
||||
from information_schema.session_status join t1 using (variable_name);
|
||||
drop table t1;
|
||||
Reference in New Issue
Block a user