mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Merge 10.2 into bb-10.2-ext
This commit is contained in:
Marko Mäkelä
commit
86c3ba65aa
16 changed files with 200 additions and 200 deletions
|
|
@ -17,7 +17,7 @@ see the Credits appendix. You can also run 'SHOW authors' to get a
|
|||
list of active contributors.
|
||||
|
||||
A description of the MariaDB project and a manual can be found at:
|
||||
http://mariadb.org/
|
||||
https://mariadb.org/
|
||||
https://mariadb.com/kb/en/
|
||||
https://mariadb.com/kb/en/mariadb-vs-mysql-features/
|
||||
https://mariadb.com/kb/en/mariadb-versus-mysql-features/
|
||||
|
|
@ -55,9 +55,9 @@ Bug Reports:
|
|||
------------
|
||||
|
||||
Bug and/or error reports regarding MariaDB should be submitted at
|
||||
http://mariadb.org/jira
|
||||
https://mariadb.org/jira
|
||||
|
||||
Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
|
||||
Bugs in the MySQL code can also be submitted at https://bugs.mysql.com
|
||||
|
||||
The code for MariaDB, including all revision history, can be found at:
|
||||
https://github.com/MariaDB/server
|
||||
|
|
|
|||
|
|
@ -1525,12 +1525,12 @@ ANALYZE
|
|||
"key_length": "5",
|
||||
"used_key_parts": ["a"],
|
||||
"ref": ["test.t3.a"],
|
||||
"r_loops": 0,
|
||||
"r_loops": 1,
|
||||
"rows": 1,
|
||||
"r_rows": null,
|
||||
"r_rows": 10,
|
||||
"r_total_time_ms": "REPLACED",
|
||||
"filtered": 100,
|
||||
"r_filtered": null,
|
||||
"r_filtered": 100,
|
||||
"index_condition_bka": "t4.b + 1 <= t3.b + 1"
|
||||
},
|
||||
"buffer_type": "flat",
|
||||
|
|
|
|||
|
|
@ -167,7 +167,8 @@ ROLLBACK;
|
|||
connection con1;
|
||||
KILL QUERY @id;
|
||||
ERROR 70100: Query execution was interrupted
|
||||
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
|
||||
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
|
||||
SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
|
||||
ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
|
||||
# session default
|
||||
connection default;
|
||||
|
|
@ -180,6 +181,10 @@ ddl_online_create_index 1
|
|||
ddl_pending_alter_table 1
|
||||
ddl_sort_file_alter_table 0
|
||||
ddl_log_file_alter_table 0
|
||||
BEGIN;
|
||||
INSERT INTO t1 VALUES(7,4,2);
|
||||
ROLLBACK;
|
||||
SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
|
||||
KILL QUERY @id;
|
||||
SET DEBUG_SYNC = 'now SIGNAL kill_done';
|
||||
# session con1
|
||||
|
|
@ -227,6 +232,7 @@ t1 CREATE TABLE `t1` (
|
|||
`c3` char(255) NOT NULL,
|
||||
PRIMARY KEY (`c1`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
|
||||
ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
|
||||
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done';
|
||||
SET lock_wait_timeout = 10;
|
||||
ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
#
|
||||
# Bug #23070734 CONCURRENT TRUNCATE TABLES CAUSE STALLS
|
||||
#
|
||||
SET @ahi= @@global.innodb_adaptive_hash_index;
|
||||
SET GLOBAL innodb_adaptive_hash_index=OFF;
|
||||
SET GLOBAL innodb_adaptive_hash_index=ON;
|
||||
Test_1 :- Check if DDL operations are possible on
|
||||
table being truncated. Also check if
|
||||
DDL operations on other tables succeed.
|
||||
|
|
@ -81,6 +84,5 @@ connection con2;
|
|||
disconnect con2;
|
||||
connection default;
|
||||
SET DEBUG_SYNC= 'RESET';
|
||||
SET session lock_wait_timeout=default;
|
||||
set global innodb_adaptive_hash_index=on;
|
||||
SET GLOBAL innodb_adaptive_hash_index=@ahi;
|
||||
drop table t1,t2,t3;
|
||||
|
|
|
|||
|
|
@ -158,7 +158,8 @@ let $ID= `SELECT @id := CONNECTION_ID()`;
|
|||
--error ER_QUERY_INTERRUPTED
|
||||
KILL QUERY @id;
|
||||
|
||||
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
|
||||
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
|
||||
SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
|
||||
--send
|
||||
ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
|
||||
|
||||
|
|
@ -166,6 +167,10 @@ ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
|
|||
connection default;
|
||||
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt';
|
||||
eval $innodb_metrics_select;
|
||||
BEGIN;
|
||||
INSERT INTO t1 VALUES(7,4,2);
|
||||
ROLLBACK;
|
||||
SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
|
||||
let $ignore= `SELECT @id := $ID`;
|
||||
KILL QUERY @id;
|
||||
SET DEBUG_SYNC = 'now SIGNAL kill_done';
|
||||
|
|
@ -201,6 +206,7 @@ WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
|
|||
--echo # session con1
|
||||
connection con1;
|
||||
SHOW CREATE TABLE t1;
|
||||
ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
|
||||
|
||||
# Exceed the configured innodb_online_alter_log_max_size.
|
||||
# The actual limit is a multiple of innodb_sort_buf_size,
|
||||
|
|
|
|||
|
|
@ -8,6 +8,12 @@
|
|||
--echo # Bug #23070734 CONCURRENT TRUNCATE TABLES CAUSE STALLS
|
||||
--echo #
|
||||
|
||||
SET @ahi= @@global.innodb_adaptive_hash_index;
|
||||
# Ensure that there is no adaptive hash index on any system tables,
|
||||
# or any other tables than the ones that we are creating below.
|
||||
SET GLOBAL innodb_adaptive_hash_index=OFF;
|
||||
SET GLOBAL innodb_adaptive_hash_index=ON;
|
||||
|
||||
--echo Test_1 :- Check if DDL operations are possible on
|
||||
--echo table being truncated. Also check if
|
||||
--echo DDL operations on other tables succeed.
|
||||
|
|
@ -115,8 +121,7 @@ disconnect con2;
|
|||
connection default;
|
||||
SET DEBUG_SYNC= 'RESET';
|
||||
|
||||
SET session lock_wait_timeout=default;
|
||||
set global innodb_adaptive_hash_index=on;
|
||||
SET GLOBAL innodb_adaptive_hash_index=@ahi;
|
||||
|
||||
drop table t1,t2,t3;
|
||||
--source include/wait_until_count_sessions.inc
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@
|
|||
VARIABLE_NAME INNODB_VERSION
|
||||
SESSION_VALUE NULL
|
||||
-GLOBAL_VALUE 5.6.37
|
||||
+GLOBAL_VALUE 5.6.36-82.1
|
||||
+GLOBAL_VALUE 5.6.36-82.2
|
||||
GLOBAL_VALUE_ORIGIN COMPILE-TIME
|
||||
DEFAULT_VALUE NULL
|
||||
VARIABLE_SCOPE GLOBAL
|
||||
|
|
|
|||
|
|
@ -24,44 +24,39 @@
|
|||
##############################################################################
|
||||
|
||||
|
||||
main.alter_table : Modified in 10.2.8
|
||||
main.alter_table : Modified in 10.2.9
|
||||
main.alter_table_online : Modified in 10.2.8
|
||||
main.analyze_format_json : MDEV-11866 - Mismatch; modified in 10.2.8
|
||||
main.analyze_stmt_slow_query_log : MDEV-12237 - Wrong result
|
||||
main.analyze_stmt_orderby : MDEV-11866 - Mismatch
|
||||
main.binary_to_hex : Added in 10.2.8
|
||||
main.bootstrap : Modified in 10.2.7
|
||||
main.check_constraint : Modified in 10.2.8
|
||||
main.client_xml : Modified in 10.2.7
|
||||
main.count_distinct : Modified in 10.2.8
|
||||
main.check_constraint : Modified in 10.2.9
|
||||
main.connect2 : MDEV-13885 - Server crash
|
||||
main.count_distinct : Modified in 10.2.9
|
||||
main.create_drop_event : Modified in 10.2.8
|
||||
main.cte_nonrecursive : Modified in 10.2.7
|
||||
main.ctype_ucs : Modified in 10.2.7
|
||||
main.derived_cond_pushdown : Modified in 10.2.7
|
||||
main.derived_view : Modified in 10.2.7
|
||||
main.ctype_utf8 : Modified in 10.2.9
|
||||
main.date_formats : Modified in 10.2.9
|
||||
main.default : Modified in 10.2.9
|
||||
main.drop-no_root : MDEV-12633 - Valgrind
|
||||
main.errors : Modified in 10.2.8
|
||||
main.events_2 : MDEV-13277 - Crash
|
||||
main.func_concat : Modified in 10.2.7
|
||||
main.func_crypt : Modified in 10.2.7
|
||||
main.func_group : Modified in 10.2.7
|
||||
main.func_json : MDEV-11648 - Crash, valgrind; modified in 10.2.8
|
||||
main.func_json : MDEV-11648 - Crash, valgrind; modified in 10.2.9
|
||||
main.func_math : Modified in 10.2.9
|
||||
main.func_misc : Modified in 10.2.9
|
||||
main.func_regexp_pcre : MDEV-13412 - Crash; modified in 10.2.8
|
||||
main.gis : Modified in 10.2.8
|
||||
main.gis-json : Modified in 10.2.8
|
||||
main.group_by : Modified in 10.2.8
|
||||
main.index_merge_innodb : MDEV-7142 - Plan mismatch; include file modified in 10.2.8
|
||||
main.index_merge_myisam : Include file modified in 10.2.8
|
||||
main.innodb_ext_key : Modified in 10.2.7
|
||||
main.innodb_mysql_lock : MDEV-7861 - Wrong result
|
||||
main.join_outer : Modified in 10.2.7
|
||||
main.insert : Modified in 10.2.9
|
||||
main.kill-2 : MDEV-13257 - Wrong result
|
||||
main.loadxml : Data file modified in 10.2.8
|
||||
main.locale : Modified in 10.2.9
|
||||
main.log_slow : MDEV-13263 - Wrong result
|
||||
main.mdl : Added in 10.2.7
|
||||
main.mdl_sync : Modified in 10.2.7
|
||||
main.myisam_debug : Modified in 10.2.7
|
||||
main.mysql : Modified in 10.2.7
|
||||
main.log_tables-big : Modified in 10.2.9
|
||||
main.myisam : Modified in 10.2.9
|
||||
main.mysql_client_test : MDEV-12633 - Valgrind
|
||||
main.mysql_client_test_comp : MDEV-12633 - Valgrind
|
||||
main.mysql_client_test_nonblock : MDEV-12633 - Valgrind, CONC-208 - Error on Power
|
||||
|
|
@ -71,51 +66,51 @@ main.mysqlcheck : MDEV-12633 - Valgrind
|
|||
main.mysqld--help : Modified in 10.2.8
|
||||
main.mysqld_option_err : MDEV-12747 - Timeout
|
||||
main.mysqlhotcopy_myisam : MDEV-10995 - Hang on debug
|
||||
main.mysqltest : Modified in 10.2.7
|
||||
main.mysqltest : MDEV-13887 - Wrong result
|
||||
main.old-mode : Modified in 10.2.9
|
||||
main.openssl_1 : MDEV-13492 - Unknown SSL error
|
||||
main.order_by : Modified in 10.2.7
|
||||
main.partition_alter : Modified in 10.2.7
|
||||
main.partition_symlink : Modified in 10.2.9
|
||||
main.range_interrupted-13751 : Added in 10.2.9
|
||||
main.read_only : Modified in 10.2.8
|
||||
main.shm : MDEV-12727 - Mismatch, ERROR 2013
|
||||
main.show_check : MDEV-12633 - Valgrind
|
||||
main.sp : MDEV-7866 - Mismatch; modified in 10.2.8
|
||||
main.sp : MDEV-7866 - Mismatch; modified in 10.2.9
|
||||
main.sp-destruct : Modified in 10.2.8
|
||||
main.sp-security : Modified in 10.2.8
|
||||
main.ssl_7937 : MDEV-11546 - Timeout on Windows
|
||||
main.ssl_ca : MDEV-10895 - SSL connection error on Power
|
||||
main.ssl_cert_verify : MDEV-13735 - Server crash
|
||||
main.ssl_connect : MDEV-13492 - Unknown SSL error
|
||||
main.ssl_timeout : MDEV-11244 - Crash
|
||||
main.stat_tables_par : MDEV-13266 - Wrong result
|
||||
main.statistics : Modified in 10.2.8
|
||||
main.status : MDEV-13255 - Wrong result
|
||||
main.subselect : Modified in 10.2.8
|
||||
main.subselect_innodb : Modified in 10.2.7
|
||||
main.subselect_mat_cost_bugs : Modified in 10.2.7
|
||||
main.subselect_nulls : Modified in 10.2.8
|
||||
main.subselect_sj : Modified in 10.2.7
|
||||
main.subselect_sj_mat : Modified in 10.2.7
|
||||
main.subselect_sj2_mat : Modified in 10.2.7
|
||||
main.trigger : Modified in 10.2.7
|
||||
main.symlink : Modified in 10.2.9
|
||||
main.tc_heuristic_recover : Added in 10.2.9
|
||||
main.type_json : Modified in 10.2.8
|
||||
main.type_num : Modified in 10.2.8
|
||||
main.union : Modified in 10.2.8
|
||||
main.view : Modified in 10.2.8
|
||||
main.win : Modified in 10.2.8
|
||||
main.win_insert_select : Added in 10.2.7
|
||||
main.userstat : MDEV-12904 - SSL errors
|
||||
main.view : Modified in 10.2.9
|
||||
main.wait_timeout : Modified in 10.2.9
|
||||
main.wait_timeout_not_windows : Modified in 10.2.9
|
||||
main.win : Modified in 10.2.9
|
||||
main.win_as_arg_to_aggregate_func : Added in 10.2.9
|
||||
main.win_insert_select : Modified in 10.2.9
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
archive.archive-big : MDEV-10615 - Table marked as crashed
|
||||
archive.mysqlhotcopy_archive : MDEV-10995 - Hang on debug
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
binlog.binlog_commit_wait : MDEV-10150 - Mismatch
|
||||
binlog.binlog_innodb : Modified in 10.2.8
|
||||
binlog.binlog_parallel_replication_marks_row : Added in 10.2.7
|
||||
binlog.binlog_parallel_replication_marks_stm_mix : Added in 10.2.7
|
||||
binlog.binlog_unsafe : Modified in 10.2.8
|
||||
binlog.flashback : Modified in 10.2.7
|
||||
binlog.mysqladmin : Added in 10.2.7
|
||||
binlog.binlog_xa_recover : MDEV-8517 - Extra checkpoint
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
|
|
@ -146,7 +141,7 @@ connect.mongo_java_3 : Added in 10.2.8
|
|||
connect.mul_new : Added in 10.2.8
|
||||
connect.mysql_exec : Modified in 10.2.8
|
||||
connect.tbl : MDEV-10179 - Mismatch, MDEV-9844 - Valgrind, crash; modified in 10.2.8
|
||||
connect.tbl_thread : MDEV-10179 - Mismatch, MDEV-9844 - Valgrind, crash; added in 10.2.8
|
||||
connect.tbl_thread : MDEV-10179 - Mismatch, MDEV-9844 - Valgrind, crash; modified in 10.2.9
|
||||
connect.vcol : MDEV-12374 - Fails on Windows
|
||||
connect.xml : Modified in 10.2.8
|
||||
connect.xml2 : Added in 10.2.8
|
||||
|
|
@ -164,24 +159,21 @@ connect.zip : Modified in 10.2.8
|
|||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
csv.read_only : Added in 10.2.7
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
encryption.create_or_replace : MDEV-9359, MDEV-13516 - Assertion failure, MDEV-12694 - Timeout
|
||||
encryption.innochecksum : Modified in 10.2.8
|
||||
encryption.innodb-checksum-algorithm : Added in 10.2.7
|
||||
encryption.innodb-compressed-blob : Modified in 10.2.7
|
||||
encryption.debug_key_management : MDEV-13841 - Timeout
|
||||
encryption.encrypt_and_grep : MDEV-13765 - Wrong result
|
||||
encryption.innochecksum : MDEV-13644 - Assertion failure; modified in 10.2.8
|
||||
encryption.innodb-discard-import-change : MDEV-12632 - Valgrind
|
||||
encryption.innodb_encryption : Modified in 10.2.9
|
||||
encryption.innodb-encryption-alter : MDEV-13566 - Lock wait timeout
|
||||
encryption.innodb_encryption_discard_import : MDEV-12903 - Wrong result
|
||||
encryption.innodb_encryption_filekeys : MDEV-9962 - Timeout
|
||||
encryption.innodb_encrypt_log : MDEV-13253 - Wrong result; modified in 10.2.8
|
||||
encryption.innodb_encrypt_log_corruption : MDEV-13253 - Wrong result
|
||||
encryption.innodb_encryption-page-compression : Re-enabled in 10.2.7
|
||||
encryption.innodb_encrypt_log : Modified in 10.2.9
|
||||
encryption.innodb_encryption_tables : MDEV-9359 - Assertion failure
|
||||
encryption.innodb-first-page-read : Added in 10.2.7
|
||||
encryption.innodb-key-rotation-disable : Modified in 10.2.7
|
||||
encryption.innodb-first-page-read : Modified in 10.2.9
|
||||
encryption.innodb_lotoftables : Modified in 10.2.9
|
||||
encryption.innodb-redo-badkey : MDEV-13893 - page cannot be decrypted; modified in 10.2.9
|
||||
encryption.innodb-spatial-index : MDEV-13746 - Wrong result; modified in 10.2.9
|
||||
encryption.second_plugin-12863 : Added in 10.2.8
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
|
@ -190,11 +182,11 @@ engines/rr_trx.* : MDEV-10998 - Not maintained
|
|||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
federated.assisted_discovery : Modified in 10.2.7
|
||||
federated.federated_innodb : MDEV-10617 - Wrong checksum
|
||||
federated.federated_transactions : MDEV-10617 - Wrong checksum
|
||||
federated.federatedx : MDEV-10617 - Wrong checksum
|
||||
federated.net_thd_crash-12725 : Added in 10.2.8
|
||||
federated.net_thd_crash-12951 : Added in 10.2.9
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
|
|
@ -216,123 +208,107 @@ funcs_2/charset.* : MDEV-10999 - Not maintained
|
|||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
galera.galera_defaults : Modified in 10.2.7
|
||||
galera.MW-309 : Added in 10.2.7
|
||||
galera.MW-369 : Added in 10.2.7
|
||||
galera.* : Suite is not stable yet
|
||||
galera_3nodes.* : Suite is not stable yet
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
gcol.gcol_bugfixes : Modified in 10.2.8
|
||||
gcol.gcol_keys_innodb : Modified in 10.2.8
|
||||
gcol.gcol_keys_myisam : Include file modified in 10.2.8
|
||||
gcol.gcol_rollback : Modified in 10.2.8
|
||||
gcol.gcol_rollback : Modified in 10.2.9
|
||||
gcol.gcol_update : Modified in 10.2.9
|
||||
gcol.innodb_virtual_basic : Modified in 10.2.8
|
||||
gcol.innodb_virtual_debug_purge : MDEV-13568 - Wrong result; modified in 10.2.8
|
||||
gcol.innodb_virtual_purge : Modified in 10.2.8
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
innodb.101_compatibility : MDEV-13570 - Crash; perl file modified in 10.2.7
|
||||
innodb.alter_missing_tablespace : Modified in 10.2.7
|
||||
innodb.101_compatibility : MDEV-13891 - Wrong result
|
||||
innodb.alter_crash : Added in 10.2.9
|
||||
innodb.alter_rename_existing : Added in 10.2.9
|
||||
innodb.create-index-debug : Added in 10.2.9
|
||||
innodb.deadlock_detect : MDEV-13262 - Wrong error code
|
||||
innodb.defrag_mdl-9155 : MDEV-11336 - Timeout
|
||||
innodb.doublewrite : Modified in 10.2.7
|
||||
innodb.drop_table_background : Added in 10.2.7
|
||||
innodb.foreign_key : Modified in 10.2.8
|
||||
innodb.group_commit_binlog_pos : Modified in 10.2.7
|
||||
innodb.group_commit_binlog_pos_no_optimize_thread : Modified in 10.2.7
|
||||
innodb.ibuf_not_empty : MDEV-12741 - Tablespace error
|
||||
innodb.group_commit_crash_no_optimize_thread : MDEV-13830 - Assertion failure
|
||||
innodb.index_merge_threshold : Modified in 10.2.8
|
||||
innodb.index_tree_operation : Added in 10.2.9
|
||||
innodb.innodb-32k : Opt file modified in 10.2.8
|
||||
innodb.innodb-32k-crash : Opt file modified in 10.2.8
|
||||
innodb.innodb-64k : Modified in 10.2.8
|
||||
innodb.innodb-64k-crash : Opt file modified in 10.2.8
|
||||
innodb.innodb-alter-debug : Modified in 10.2.7
|
||||
innodb.innodb-alter-nullable : Modified in 10.2.7
|
||||
innodb.innodb-alter-table : Modified in 10.2.7
|
||||
innodb.innodb-alter-tempfile : Modified in 10.2.7
|
||||
innodb.innodb-alter-timestamp : Modified in 10.2.7
|
||||
innodb.innodb_bug14147491 : MDEV-11808 - Index is corrupt
|
||||
innodb.innodb_bug53290 : MDEV-12634 - Valgrind
|
||||
innodb.innodb-alter : Added in 10.2.9
|
||||
innodb.innodb-alter-autoinc : Added in 10.2.9
|
||||
innodb.innodb_defragment : MDEV-11336 - Mismatch
|
||||
innodb.innodb_defragment_fill_factor : Modified in 10.2.8
|
||||
innodb.innodb_defragment_small : MDEV-11336 - Mismatch
|
||||
innodb.innodb_defrag_binlog : MDEV-11336 - Mismatch
|
||||
innodb.innodb_defrag_concurrent : MDEV-11336 - Assertion failure, mismatch
|
||||
innodb.innodb_defrag_stats : MDEV-11336 - Mismatch
|
||||
innodb.innodb-enlarge-blob : Added in 10.2.8
|
||||
innodb.innodb_force_recovery : Modified in 10.2.7
|
||||
innodb.innodb-enlarge-blob : Modified in 10.2.9
|
||||
innodb.innodb-get-fk : MDEV-13276 - Server crash
|
||||
innodb.innodb-index : Modified in 10.2.9
|
||||
innodb.innodb-index-debug : Added in 10.2.9
|
||||
innodb.innodb-index-online : Added in 10.2.9
|
||||
innodb.innodb-index-online-delete : Added in 10.2.9
|
||||
innodb.innodb-index-online-fk : Added in 10.2.9
|
||||
innodb.innodb-index-online-purge : Added in 10.2.9
|
||||
innodb.innodb_information_schema : MDEV-8851 - Wrong result
|
||||
innodb.innodb_max_recordsize_32k : Added in 10.2.8
|
||||
innodb.innodb_max_recordsize_64k : Added in 10.2.8
|
||||
innodb.innodb-page_compression_default : Modified in 10.2.7
|
||||
innodb.innodb-page_compression_snappy : Modified in 10.2.7
|
||||
innodb.innodb_stats_persistent : Added in 10.2.7
|
||||
innodb.innodb-page_compression_default : MDEV-13644 - Assertion failure
|
||||
innodb.innodb-table-online : MDEV-13894 - Wrong result; modified in 10.2.9
|
||||
innodb.innodb_stats_persistent_debug : Added in 10.2.9
|
||||
innodb.innodb_sys_semaphore_waits : MDEV-10331 - Semaphore wait
|
||||
innodb.innodb-wl5522-debug : Modified in 10.2.9
|
||||
innodb.innodb-wl5980-alter : Added in 10.2.9
|
||||
innodb.innodb_zip_innochecksum : Added in 10.2.8
|
||||
innodb.innodb_zip_innochecksum2 : Added in 10.2.8
|
||||
innodb.innodb_zip_innochecksum3 : Added in 10.2.8
|
||||
innodb.log_corruption : MDEV-13251 - Wrong result
|
||||
innodb.log_data_file_size : Modified in 10.2.7
|
||||
innodb.log_file : Modified in 10.2.7
|
||||
innodb.log_file_name : Modified in 10.2.7
|
||||
innodb.log_file_size : MDEV-13471 - Crash; modified in 10.2.7
|
||||
innodb.purge_thread_shutdown : Added in 10.2.8
|
||||
innodb.read_only_recovery : Modified in 10.2.8
|
||||
innodb.log_data_file_size : Modified in 10.2.9
|
||||
innodb.purge_thread_shutdown : MDEV-13792 - Wrong result; added in 10.2.8
|
||||
innodb.read_only_recovery : MDEV-13886 - Server crash, modified in 10.2.8
|
||||
innodb.rename_table : Added in 10.2.8
|
||||
innodb.row_format_redundant : Added in 10.2.7
|
||||
innodb.table_flags : MDEV-13572 - Wrong result; added in 10.2.7
|
||||
innodb.temporary_table : MDEV-13265 - Wrong result; modified in 10.2.7
|
||||
innodb.table_flags : MDEV-13572 - Wrong result; modified in 10.2.9
|
||||
innodb.temporary_table : MDEV-13265 - Wrong result
|
||||
innodb.truncate_debug : MDEV-13256 - Timeout
|
||||
innodb.truncate_purge_debug : Modified in 10.2.7
|
||||
innodb.xa_recovery : Modified in 10.2.9
|
||||
|
||||
innodb_fts.fulltext_misc : MDEV-12636 - Valgrind
|
||||
innodb_fts.innodb_fts_plugin : Modified in 10.2.7
|
||||
innodb_fts.innodb_fts_plugin : MDEV-13888 - Errors in server log
|
||||
innodb_fts.innodb_fts_stopword_charset : MDEV-13259 - Table crashed
|
||||
|
||||
innodb_gis.1 : Modified in 10.2.8
|
||||
innodb_gis.alter_spatial_index : Modified in 10.2.9
|
||||
innodb_gis.gis : Modified in 10.2.8
|
||||
|
||||
innodb_zip.bug36169 : Modified in 10.2.7
|
||||
innodb_zip.bug36172 : Modified in 10.2.7
|
||||
innodb_zip.bug52745 : Modified in 10.2.7
|
||||
innodb_zip.bug53591 : Modified in 10.2.7
|
||||
innodb_zip.bug56680 : Modified in 10.2.7
|
||||
innodb_zip.cmp_drop_table : Modified in 10.2.7
|
||||
innodb_zip.create_options : Modified in 10.2.7
|
||||
innodb_zip.innochecksum : Modified in 10.2.7
|
||||
innodb_zip.innochecksum_2 : Modified in 10.2.7
|
||||
innodb_zip.create_options : Modified in 10.2.9
|
||||
innodb_zip.innochecksum_3 : MDEV-13279 - Extra warnings; modified in 10.2.8
|
||||
innodb_zip.innodb-zip : Modified in 10.2.7
|
||||
innodb_zip.recover : Modified in 10.2.7
|
||||
innodb_zip.restart : Modified in 10.2.7
|
||||
innodb_zip.wl6501_1 : MDEV-10891 - Can't create UNIX socket
|
||||
innodb_zip.wl5522_debug_zip : MDEV-11600 - Operating system error number 2; modified in 10.2.7
|
||||
innodb_zip.wl5522_zip : Modified in 10.2.7
|
||||
innodb_zip.wl6344_compress_level : Modified in 10.2.7
|
||||
innodb_zip.wl5522_debug_zip : MDEV-11600 - Operating system error number 2; modified in 10.2.9
|
||||
innodb_zip.wl6501_scale_1 : MDEV-13254 - Timeout
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
maria.insert_select : MDEV-12757 - Timeout
|
||||
maria.maria : Modified in 10.2.9
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
mariabackup.* : suite.pm and .opt modified in 10.2.7
|
||||
|
||||
mariabackup.full_backup : Modified in 10.2.7
|
||||
mariabackup.apply-log-only : Added in 10.2.9
|
||||
mariabackup.apply-log-only-incr : Added in 10.2.9
|
||||
mariabackup.auth_plugin_win : Added in 10.2.9
|
||||
mariabackup.full_backup : MDEV-13889 - Timeout
|
||||
mariabackup.huge_lsn : Added in 10.2.8
|
||||
mariabackup.incremental_backup : Modified in 10.2.8
|
||||
mariabackup.incremental_encrypted : Modified in 10.2.7
|
||||
mariabackup.partial : Modified in 10.2.7
|
||||
mariabackup.partial_exclude : Modified in 10.2.7
|
||||
mariabackup.small_ibd : Modified in 10.2.7
|
||||
mariabackup.xb_aws_key_management : Modified in 10.2.7
|
||||
mariabackup.xb_compressed_encrypted : Modified in 10.2.7
|
||||
mariabackup.xb_file_key_management : Modified in 10.2.7
|
||||
mariabackup.xb_partition : Modified in 10.2.7
|
||||
mariabackup.xbstream : Modified in 10.2.7
|
||||
mariabackup.lock_ddl_per_table : Added in 10.2.9
|
||||
mariabackup.partial : Modified in 10.2.9
|
||||
mariabackup.xb_aws_key_management : Modified in 10.2.9
|
||||
mariabackup.xb_compressed_encrypted : MDEV-13890 - Assertion failure
|
||||
mariabackup.xb_page_compress : Modified in 10.2.9
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
|
|
@ -341,15 +317,21 @@ mroonga/storage.index_multiple_column_unique_datetime_index_read : MDEV-8643 - V
|
|||
#----------------------------------------------------------------
|
||||
|
||||
multi_source.info_logs : MDEV-12629 - Valgrind
|
||||
multi_source.mdev-9544 : Added in 10.2.7
|
||||
multi_source.reset_slave : MDEV-10690 - Wrong result
|
||||
multi_source.simple : MDEV-4633 - Wrong result
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
parts.longname : Added in 10.2.7
|
||||
parts.partition_debug_innodb : MDEV-10891 - Can't create UNIX socket
|
||||
parts.quoting : Added in 10.2.7
|
||||
parts.partition_exch_myisam_innodb : Modified in 10.2.9
|
||||
parts.partition_exch_qa_10 : Include files modified in 10.2.9
|
||||
parts.partition_exch_qa_11 : Include files modified in 10.2.9
|
||||
parts.partition_exch_qa_12 : Include files modified in 10.2.9
|
||||
parts.partition_exch_qa_14 : Modified in 10.2.9
|
||||
parts.partition_exch_qa_15 : Modified in 10.2.9
|
||||
parts.partition_exch_qa_2 : Modified in 10.2.9
|
||||
parts.partition_exch_qa_3 : Modified in 10.2.9
|
||||
parts.partition_exch_qa_6 : Modified in 10.2.9
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
|
|
@ -357,7 +339,7 @@ percona.* : MDEV-10997 - Not maintained
|
|||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
perfschema.bad_option_2 : Modified in 10.2.7
|
||||
perfschema.bad_option_1 : MDEV-13892 - Timeout
|
||||
perfschema.bad_option_3 : MDEV-12728 - Timeout on Power
|
||||
perfschema.hostcache_ipv4_addrinfo_again_allow : MDEV-12759 - Crash
|
||||
perfschema.hostcache_ipv6_addrinfo_again_allow : MDEV-12752 - Crash
|
||||
|
|
@ -366,7 +348,6 @@ perfschema.hostcache_ipv6_ssl : MDEV-10696 - Crash
|
|||
perfschema.privilege_table_io : Modified in 10.2.8
|
||||
perfschema.setup_actors : MDEV-10679 - Crash
|
||||
perfschema.stage_mdl_procedure : MDEV-11545 - Missing row
|
||||
perfschema.start_server_1_digest : Added in 10.2.7
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
|
|
@ -382,24 +363,16 @@ rocksdb.* : MyRocks is alpha-quality and tests are uns
|
|||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
roles.current_role_view-12666 : Added in 10.2.7
|
||||
roles.show_create_database-10463 : Added in 10.2.7
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
rpl.circular_serverid0 : Added in 10.2.7
|
||||
rpl.rpl_binlog_errors : MDEV-12742 - Crash
|
||||
rpl.rpl_binlog_index : MDEV-9501 - Failed registering on master
|
||||
rpl.rpl_domain_id_filter_io_crash : MDEV-12729 - Timeout in include file
|
||||
rpl.rpl_domain_id_filter_io_crash : MDEV-12729 - Timeout in include file, MDEV-13677 - Server crash
|
||||
rpl.rpl_domain_id_filter_restart : MDEV-10684 - Wrong result
|
||||
rpl.rpl_gtid_crash : MDEV-9501 - Failed registering on master
|
||||
rpl.rpl_gtid_errorhandling : MDEV-13261 - Crash
|
||||
rpl.rpl_gtid_crash : MDEV-9501 - Failed registering on master, MDEV-13643 - Lost connection
|
||||
rpl.rpl_gtid_errorhandling : MDEV-13261 - Crash; modified in 10.2.9
|
||||
rpl.rpl_gtid_stop_start : MDEV-11621 - Table marked as crashed, MDEV-12731 - Valgrind
|
||||
rpl.rpl_mariadb_slave_capability : MDEV-11018 - Extra lines in binlog
|
||||
rpl.rpl_mdev-11092 : Added in 10.2.7
|
||||
rpl.rpl_parallel : MDEV-12730 - Assertion failure
|
||||
rpl.rpl_parallel_mdev6589 : MDEV-12979 - Assertion failure
|
||||
rpl.rpl_parallel_optimistic : Modified in 10.2.7
|
||||
rpl.rpl_parallel_optimistic_nobinlog : MDEV-12746 - Timeouts, mismatch
|
||||
rpl.rpl_parallel_retry : MDEV-11119 - Crash
|
||||
rpl.rpl_temporal_mysql56_to_mariadb53 : MDEV-9501 - Failed registering on master
|
||||
|
|
@ -410,8 +383,11 @@ rpl.rpl_skip_replication : MDEV-13258 - Extra warning
|
|||
rpl.rpl_slave_grp_exec : MDEV-10514 - Deadlock
|
||||
rpl.rpl_slow_query_log : MDEV-13250 - Test abort
|
||||
rpl.rpl_sp_effects : MDEV-13249 - Crash
|
||||
rpl.rpl_sp_variables : Added in 10.2.9
|
||||
rpl.rpl_start_stop_slave : MDEV-13567 - Sync slave timeout
|
||||
rpl.rpl_stm_multi_query : MDEV-9501 - Failed registering on master
|
||||
rpl.rpl_stm_stop_middle_group : MDEV-13791 - Server crash
|
||||
rpl.rpl_temporal_format_mariadb53_to_mysql56_dst : Added in 10.2.9
|
||||
rpl.rpl_upgrade_master_info : MDEV-11620 - Table marked as crashed
|
||||
|
||||
rpl/extra/rpl_tests.* : MDEV-10994 - Not maintained
|
||||
|
|
@ -420,6 +396,9 @@ rpl/extra/rpl_tests.* : MDEV-10994 - Not maintained
|
|||
|
||||
spider.basic_sql : MDEV-11186 - Internal check fails
|
||||
|
||||
spider/bg.direct_aggregate : MDEV-7098 - Packets out of order
|
||||
spider/bg.spider3_fixes : MDEV-12639 - Syntax error
|
||||
|
||||
spider/handler.* : MDEV-10990 - Not maintained
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
|
@ -434,21 +413,14 @@ storage_engine.* : Not always timely maintained
|
|||
#----------------------------------------------------------------
|
||||
|
||||
sys_vars.back_log_basic : Modified in 10.2.8
|
||||
sys_vars.delay_key_write_func : Modified in 10.2.7
|
||||
sys_vars.innodb_sched_priority_cleaner_basic : Modified in 10.2.7
|
||||
sys_vars.rpl_init_slave_func : MDEV-10149 - Test assertion
|
||||
sys_vars.tmp_disk_table_size_basic : Added in 10.2.7
|
||||
sys_vars.tmp_disk_table_size_func : Added in 10.2.7
|
||||
sys_vars.tmp_memory_table_size_basic : Added in 10.2.7
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
tokudb.background_job_manager : Modified in 10.2.7
|
||||
tokudb.bug-1657908 : Added in 10.2.7
|
||||
tokudb.change_column_all_1000_10 : MDEV-12640 - Lost connection
|
||||
tokudb.change_column_bin : MDEV-12640 - Lost connection
|
||||
tokudb.change_column_char : MDEV-12822 - Lost connection
|
||||
tokudb.dir_cmd : Added in 10.2.7
|
||||
tokudb.dir_per_db : MDEV-11537 - Wrong result; modified in 10.2.9
|
||||
tokudb.hotindex-insert-bigchar : MDEV-12640 - Crash
|
||||
tokudb.hotindex-update-1 : MDEV-12640 - Crash
|
||||
tokudb.kill_query_blocked_in_lt : Added in 10.2.8
|
||||
|
|
@ -459,19 +431,11 @@ tokudb.rows-32m-seq-insert : MDEV-12640 - Crash
|
|||
tokudb_mariadb.mdev12972 : Modified in 10.2.8
|
||||
tokudb_mariadb.mdev6657 : MDEV-12737 - Mismatch or valgrind
|
||||
|
||||
tokudb_backup.* : MDEV-11001 - Missing include file; suite.pm modified in 10.2.7
|
||||
tokudb_backup.* : MDEV-11001 - Missing include file
|
||||
tokudb_sys_vars.* : MDEV-11001 - Missing include file
|
||||
tokudb_rpl.* : MDEV-11001 - Missing include file
|
||||
|
||||
tokudb_backup.backup_master_info : Added in 10.2.7
|
||||
tokudb_backup.backup_master_state : Added in 10.2.7
|
||||
tokudb_backup.empty_slave_info_file : Added in 10.2.7
|
||||
tokudb_backup.innodb_use_native_aio_enabled : Added in 10.2.7
|
||||
tokudb_backup.rpl_safe_slave : Include file modified in 10.2.8
|
||||
tokudb_backup.rpl_tokudb_commit_sync : Added in 10.2.7
|
||||
|
||||
tokudb_bugs.db233 : Modified in 10.2.7
|
||||
tokudb_bugs.leak172 : Modified in 10.2.7
|
||||
|
||||
tokudb_parts.partition_alter4_tokudb : MDEV-12640 - Lost connection
|
||||
|
||||
|
|
@ -511,12 +475,17 @@ unit.conc_ps_bugs : MDEV-13252 - not ok 44 test_bug4236
|
|||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
vcol.cross_db : Added in 10.2.7
|
||||
vcol.upgrade : Added in 10.2.7
|
||||
vcol.innodb_virtual_fk : Added in 10.2.9
|
||||
vcol.update : Modified in 10.2.9
|
||||
vcol.vcol_supported_sql_funcs : Include file modified in 10.2.9
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
wsrep.pool_of_threads : MDEV-12234 - GLIBCXX_3.4.20 not found; modified in 10.2.7
|
||||
wsrep.binlog_format : MDEV-11532 - Could not execute check-testcase
|
||||
wsrep.foreign_key : Re-enabled in 10.2.9
|
||||
wsrep.mdev_6832 : Option file changed in 10.2.9
|
||||
wsrep.mdev_7798 : Option file changed in 10.2.9
|
||||
wsrep.pool_of_threads : MDEV-12234 - GLIBCXX_3.4.20 not found
|
||||
|
||||
wsrep_info.plugin : MDEV-13569 - No nodes coming from prim view
|
||||
|
||||
|
|
|
|||
|
|
@ -387,18 +387,9 @@ ADD_CUSTOM_TARGET(
|
|||
SET_TARGET_PROPERTIES(GenServerSource PROPERTIES EXCLUDE_FROM_ALL TRUE)
|
||||
|
||||
IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
|
||||
ADD_LIBRARY(udf_example MODULE udf_example.c)
|
||||
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
|
||||
SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "")
|
||||
# udf_example depends on strings
|
||||
IF(WIN32)
|
||||
IF(MSVC)
|
||||
SET_TARGET_PROPERTIES(udf_example PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
|
||||
ENDIF()
|
||||
TARGET_LINK_LIBRARIES(udf_example strings)
|
||||
ELSE()
|
||||
# udf_example is using safemutex exported by mysqld
|
||||
TARGET_LINK_LIBRARIES(udf_example mysqld)
|
||||
ENDIF()
|
||||
TARGET_LINK_LIBRARIES(udf_example strings)
|
||||
ENDIF()
|
||||
|
||||
CONFIGURE_FILE(
|
||||
|
|
|
|||
|
|
@ -3862,6 +3862,7 @@ int JOIN_TAB_SCAN_MRR::open()
|
|||
/* Dynamic range access is never used with BKA */
|
||||
DBUG_ASSERT(join_tab->use_quick != 2);
|
||||
|
||||
join_tab->tracker->r_scans++;
|
||||
save_or_restore_used_tabs(join_tab, FALSE);
|
||||
|
||||
init_mrr_buff();
|
||||
|
|
@ -3905,6 +3906,8 @@ int JOIN_TAB_SCAN_MRR::next()
|
|||
int rc= join_tab->table->file->multi_range_read_next((range_id_t*)ptr) ? -1 : 0;
|
||||
if (!rc)
|
||||
{
|
||||
join_tab->tracker->r_rows++;
|
||||
join_tab->tracker->r_rows_after_where++;
|
||||
/*
|
||||
If a record in in an incremental cache contains no fields then the
|
||||
association for the last record in cache will be equal to cache->end_pos
|
||||
|
|
|
|||
|
|
@ -1716,16 +1716,12 @@ PageConverter::update_records(
|
|||
|
||||
m_rec_iter.open(block);
|
||||
|
||||
if (!page_is_leaf(block->frame)) {
|
||||
return DB_SUCCESS;
|
||||
}
|
||||
|
||||
while (!m_rec_iter.end()) {
|
||||
|
||||
rec_t* rec = m_rec_iter.current();
|
||||
|
||||
/* FIXME: Move out of the loop */
|
||||
|
||||
if (rec_get_status(rec) == REC_STATUS_NODE_PTR) {
|
||||
break;
|
||||
}
|
||||
|
||||
ibool deleted = rec_get_deleted_flag(rec, comp);
|
||||
|
||||
/* For the clustered index we have to adjust the BLOB
|
||||
|
|
|
|||
|
|
@ -853,7 +853,7 @@ row_log_table_low_redundant(
|
|||
|
||||
size = rec_get_converted_size_temp(
|
||||
index, tuple->fields, tuple->n_fields, &extra_size);
|
||||
ulint v_size = ventry
|
||||
ulint v_size = num_v
|
||||
? rec_get_converted_size_temp_v(index, ventry) : 0;
|
||||
|
||||
mrec_size = ROW_LOG_HEADER_SIZE + size + v_size + (extra_size >= 0x80);
|
||||
|
|
@ -909,12 +909,10 @@ row_log_table_low_redundant(
|
|||
rec_convert_dtuple_to_temp(
|
||||
b + extra_size, index, tuple->fields, tuple->n_fields);
|
||||
b += size;
|
||||
if (ventry) {
|
||||
ut_ad(!num_v == !v_size);
|
||||
if (num_v) {
|
||||
rec_convert_dtuple_to_temp_v(b, new_index, ventry);
|
||||
b += v_size;
|
||||
}
|
||||
|
||||
if (num_v) {
|
||||
if (o_ventry) {
|
||||
rec_convert_dtuple_to_temp_v(
|
||||
b, new_index, o_ventry);
|
||||
|
|
|
|||
|
|
@ -660,11 +660,24 @@ int maria_create(const char *name, enum data_file_type datafile_type,
|
|||
|
||||
if (length > max_key_length)
|
||||
max_key_length= length;
|
||||
tot_length+= ((max_rows/(ulong) (((uint) maria_block_size -
|
||||
|
||||
if (tot_length == ULLONG_MAX)
|
||||
continue;
|
||||
|
||||
ulonglong tot_length_part= (max_rows/(ulong) (((uint) maria_block_size -
|
||||
MAX_KEYPAGE_HEADER_SIZE -
|
||||
KEYPAGE_CHECKSUM_SIZE)/
|
||||
(length*2))) *
|
||||
maria_block_size);
|
||||
(length*2)));
|
||||
if (tot_length_part >= (ULLONG_MAX / maria_block_size +
|
||||
ULLONG_MAX % maria_block_size))
|
||||
tot_length= ULLONG_MAX;
|
||||
else
|
||||
{
|
||||
if (tot_length > ULLONG_MAX - tot_length_part * maria_block_size)
|
||||
tot_length= ULLONG_MAX;
|
||||
else
|
||||
tot_length+= tot_length_part * maria_block_size;
|
||||
}
|
||||
}
|
||||
|
||||
unique_key_parts=0;
|
||||
|
|
@ -673,11 +686,24 @@ int maria_create(const char *name, enum data_file_type datafile_type,
|
|||
uniquedef->key=keys+i;
|
||||
unique_key_parts+=uniquedef->keysegs;
|
||||
share.state.key_root[keys+i]= HA_OFFSET_ERROR;
|
||||
tot_length+= (max_rows/(ulong) (((uint) maria_block_size -
|
||||
|
||||
if (tot_length == ULLONG_MAX)
|
||||
continue;
|
||||
ulonglong tot_length_part= (max_rows/(ulong) (((uint) maria_block_size -
|
||||
MAX_KEYPAGE_HEADER_SIZE -
|
||||
KEYPAGE_CHECKSUM_SIZE) /
|
||||
((MARIA_UNIQUE_HASH_LENGTH + pointer)*2)))*
|
||||
(ulong) maria_block_size;
|
||||
((MARIA_UNIQUE_HASH_LENGTH + pointer)*2)));
|
||||
|
||||
if (tot_length_part >= (ULLONG_MAX / maria_block_size +
|
||||
ULLONG_MAX % maria_block_size))
|
||||
tot_length= ULLONG_MAX;
|
||||
else
|
||||
{
|
||||
if (tot_length > ULLONG_MAX - tot_length_part * maria_block_size)
|
||||
tot_length= ULLONG_MAX;
|
||||
else
|
||||
tot_length+= tot_length_part * maria_block_size;
|
||||
}
|
||||
}
|
||||
keys+=uniques; /* Each unique has 1 key */
|
||||
key_segs+=uniques; /* Each unique has 1 key seg */
|
||||
|
|
@ -746,8 +772,7 @@ int maria_create(const char *name, enum data_file_type datafile_type,
|
|||
Get estimate for index file length (this may be wrong for FT keys)
|
||||
This is used for pointers to other key pages.
|
||||
*/
|
||||
tmp= (tot_length + maria_block_size * keys *
|
||||
MARIA_INDEX_BLOCK_MARGIN) / maria_block_size;
|
||||
tmp= (tot_length / maria_block_size + keys * MARIA_INDEX_BLOCK_MARGIN);
|
||||
|
||||
/*
|
||||
use maximum of key_file_length we calculated and key_file_length value we
|
||||
|
|
|
|||
|
|
@ -293,6 +293,9 @@ link_directories(
|
|||
|
||||
if(MRN_BUNDLED)
|
||||
target_link_libraries(mroonga ${MRN_LIBRARIES})
|
||||
if(NOT TARGET mroonga)
|
||||
return()
|
||||
endif()
|
||||
else()
|
||||
add_library(mroonga MODULE ${MRN_ALL_SOURCES})
|
||||
|
||||
|
|
|
|||
|
|
@ -2599,7 +2599,7 @@ loop:
|
|||
start_lsn += len;
|
||||
buf += len;
|
||||
|
||||
if (recv_sys && recv_sys->report(ut_time())) {
|
||||
if (recv_recovery_is_on() && recv_sys && recv_sys->report(ut_time())) {
|
||||
ib_logf(IB_LOG_LEVEL_INFO, "Read redo log up to LSN=" LSN_PF,
|
||||
start_lsn);
|
||||
sd_notifyf(0, "STATUS=Read redo log up to LSN=" LSN_PF,
|
||||
|
|
|
|||
|
|
@ -1793,16 +1793,12 @@ PageConverter::update_records(
|
|||
|
||||
m_rec_iter.open(block);
|
||||
|
||||
if (!page_is_leaf(block->frame)) {
|
||||
return DB_SUCCESS;
|
||||
}
|
||||
|
||||
while (!m_rec_iter.end()) {
|
||||
|
||||
rec_t* rec = m_rec_iter.current();
|
||||
|
||||
/* FIXME: Move out of the loop */
|
||||
|
||||
if (rec_get_status(rec) == REC_STATUS_NODE_PTR) {
|
||||
break;
|
||||
}
|
||||
|
||||
ibool deleted = rec_get_deleted_flag(rec, comp);
|
||||
|
||||
/* For the clustered index we have to adjust the BLOB
|
||||
|
|
|
|||
Loading…
Reference in a new issue