diff options
Diffstat (limited to 'storage/rocksdb')
48 files changed, 250 insertions, 206 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 2308d69f..0228703f 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -165,6 +165,8 @@ IF(NOT TARGET rocksdb) RETURN() ENDIF() +INSTALL_MANPAGES(rocksdb-engine mariadb-ldb.1 myrocks_hotbackup.1) + CHECK_CXX_SOURCE_COMPILES(" #if defined(_MSC_VER) && !defined(__thread) #define __thread __declspec(thread) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 8067d6f6..4ab02520 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -5235,6 +5235,24 @@ static int rocksdb_check_version(handlerton *hton, return (create_id == ver); } + +/* + Setup costs factors for RocksDB to be able to approximate how many + ms different opperations takes. See cost functions in handler.h how + the different variables are used +*/ + +static void rocksdb_update_optimizer_costs(OPTIMIZER_COSTS *costs) +{ + /* See optimizer_costs.txt for how these are calculated */ + costs->row_next_find_cost= 0.00015161; + costs->row_lookup_cost= 0.00150453; + costs->key_next_find_cost= 0.00025108; + costs->key_lookup_cost= 0.00079369; + costs->row_copy_cost= 0.00006087; +} + + /* Storage Engine initialization function, invoked when plugin is loaded. */ @@ -5343,6 +5361,7 @@ static int rocksdb_init_func(void *const p) { rocksdb_hton->savepoint_rollback = rocksdb_rollback_to_savepoint; rocksdb_hton->savepoint_rollback_can_release_mdl = rocksdb_rollback_to_savepoint_can_release_mdl; + rocksdb_hton->update_optimizer_costs= rocksdb_update_optimizer_costs; #ifdef MARIAROCKS_NOT_YET rocksdb_hton->update_table_stats = rocksdb_update_table_stats; #endif // MARIAROCKS_NOT_YET @@ -6466,7 +6485,7 @@ bool ha_rocksdb::should_hide_ttl_rec(const Rdb_key_def &kd, /* increment examined row count when rows are skipped */ THD *thd = ha_thd(); - thd->inc_examined_row_count(1); + thd->inc_examined_row_count(); DEBUG_SYNC(thd, "rocksdb.ttl_rows_examined"); } return is_hide_ttl; @@ -14631,17 +14650,25 @@ bool ha_rocksdb::use_read_free_rpl() const { } #endif // MARIAROCKS_NOT_YET -double ha_rocksdb::read_time(uint index, uint ranges, ha_rows rows) { +IO_AND_CPU_COST ha_rocksdb::keyread_time(uint index, ulong ranges, + ha_rows rows, + ulonglong blocks) { DBUG_ENTER_FUNC(); + IO_AND_CPU_COST cost; + cost= handler::keyread_time(index, ranges, rows, blocks); + cost.io/= 4; // Assume 75% compression (75% less IO) + DBUG_RETURN(cost); +} - if (index != table->s->primary_key) { - /* Non covering index range scan */ - DBUG_RETURN(handler::read_time(index, ranges, rows)); - } - DBUG_RETURN((rows / 20.0) + 1); +ulonglong ha_rocksdb::index_blocks(uint index, uint ranges, ha_rows rows) +{ + size_t len= table->key_storage_length(index); + ulonglong blocks= (rows * len / 4) / stats.block_size + ranges; // 75 % compression + return blocks * stats.block_size / IO_SIZE; } + void ha_rocksdb::print_error(int error, myf errflag) { if (error == HA_ERR_ROCKSDB_STATUS_BUSY) { error = HA_ERR_LOCK_DEADLOCK; diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h index ea91b9b3..eeb2ddfe 100644 --- a/storage/rocksdb/ha_rocksdb.h +++ b/storage/rocksdb/ha_rocksdb.h @@ -623,15 +623,19 @@ public: bool sorted) override MY_ATTRIBUTE((__warn_unused_result__)); - virtual double scan_time() override { + IO_AND_CPU_COST scan_time() override + { + IO_AND_CPU_COST cost; DBUG_ENTER_FUNC(); - - DBUG_RETURN( - static_cast<double>((stats.records + stats.deleted) / 20.0 + 10)); + cost= handler::scan_time(); + cost.cpu+= stats.deleted * ROW_NEXT_FIND_COST; // We have to skip over deleted rows + DBUG_RETURN(cost); } + IO_AND_CPU_COST keyread_time(uint index, ulong ranges, + ha_rows rows, ulonglong blocks) override; - virtual double read_time(uint, uint, ha_rows rows) override; - virtual void print_error(int error, myf errflag) override; + ulonglong index_blocks(uint index, uint ranges, ha_rows rows) override; + void print_error(int error, myf errflag) override; int open(const char *const name, int mode, uint test_if_locked) override MY_ATTRIBUTE((__warn_unused_result__)); diff --git a/storage/rocksdb/mariadb-ldb.1 b/storage/rocksdb/mariadb-ldb.1 new file mode 100644 index 00000000..5d58bd0b --- /dev/null +++ b/storage/rocksdb/mariadb-ldb.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\fBMARIADB-LDB\fR" "1" "15 May 2020" "MariaDB 10.11" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +mariadb-ldb \- RocksDB tool (mysql_ldb is now a symlink to mariadb-ldb) +.SH DESCRIPTION +Use \fBmysql_ldb \-\-help\fR for details on usage\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/storage/rocksdb/myrocks_hotbackup.1 b/storage/rocksdb/myrocks_hotbackup.1 new file mode 100644 index 00000000..99dcbefa --- /dev/null +++ b/storage/rocksdb/myrocks_hotbackup.1 @@ -0,0 +1,82 @@ +.TH MYROCKS_HOTBACKUP "1" "15 May 2020" "MariaDB 10.11" "MariaDB Database System" +.SH NAME +myrocks_hotbackup \- streaming backup for MariaDB MyRocks +.SH DESCRIPTION +Usage: +.PP +Backup: set \fB\-o\fR pipefail; myrocks_hotbackup \fB\-\-user\fR=\fI\,root\/\fR \fB\-\-password\fR=\fI\,pw\/\fR \fB\-\-port\fR=\fI\,3306\/\fR \fB\-\-checkpoint_dir=\fR<directory where temporary backup hard links are created> | ssh \fB\-o\fR NoneEnabled=yes remote_server 'tar \fB\-xi\fR \fB\-C\fR <directory on remote server where backups will be sent>' . You need to execute backup command on a server where you take backups. +.PP +Backup using WDT: myrocks_hotbackup \fB\-\-user\fR=\fI\,root\/\fR \fB\-\-password\fR=\fI\,pw\/\fR \fB\-\-stream\fR=\fI\,wdt\/\fR \fB\-\-checkpoint_dir=\fR<directory where temporary backup hard links are created> \fB\-\-destination=\fR<remote host name> \fB\-\-backup_dir=\fR<remote directory name>. This has to be executed at the src host. +.PP +Move\-Back: myrocks_hotbackup \fB\-\-move_back\fR \fB\-\-datadir=\fR<dest mysql datadir> \fB\-\-rocksdb_datadir=\fR<dest rocksdb datadir> \fB\-\-rocksdb_waldir=\fR<dest rocksdb wal dir> \fB\-\-backup_dir=\fR<where backup files are stored> . You need to execute move\-back command on a server where backup files are sent. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-i\fR CHECKPOINT_INTERVAL, \fB\-\-interval\fR=\fI\,CHECKPOINT_INTERVAL\/\fR +Number of seconds to renew checkpoint +.TP +\fB\-c\fR CHECKPOINT_DIRECTORY, \fB\-\-checkpoint_dir\fR=\fI\,CHECKPOINT_DIRECTORY\/\fR +Local directory name where checkpoints will be +created. +.TP +\fB\-d\fR DATADIR, \fB\-\-datadir\fR=\fI\,DATADIR\/\fR +backup mode: src MySQL datadir. move_back mode: dest +MySQL datadir +.TP +\fB\-s\fR OUTPUT_STREAM, \fB\-\-stream\fR=\fI\,OUTPUT_STREAM\/\fR +Setting streaming backup options. Currently tar, WDT +and xbstream are supported. Default is tar +.TP +\fB\-\-destination\fR=\fI\,DESTINATION\/\fR +Remote server name. Only used for WDT mode so far. +.TP +\fB\-\-avg_mbytes_per_sec\fR=\fI\,AVG_MBYTES_PER_SEC\/\fR +Average backup rate in MBytes/sec. WDT only. +.TP +\fB\-\-extra_wdt_sender_options\fR=\fI\,EXTRA_WDT_SENDER_OPTIONS\/\fR +Extra options for WDT sender +.TP +\fB\-\-extra_wdt_receiver_options\fR=\fI\,EXTRA_WDT_RECEIVER_OPTIONS\/\fR +Extra options for WDT receiver +.TP +\fB\-u\fR MYSQL_USER, \fB\-\-user\fR=\fI\,MYSQL_USER\/\fR +MySQL user name +.TP +\fB\-p\fR MYSQL_PASSWORD, \fB\-\-password\fR=\fI\,MYSQL_PASSWORD\/\fR +MySQL password name +.TP +\fB\-P\fR MYSQL_PORT, \fB\-\-port\fR=\fI\,MYSQL_PORT\/\fR +MySQL port number +.TP +\fB\-S\fR MYSQL_SOCKET, \fB\-\-socket\fR=\fI\,MYSQL_SOCKET\/\fR +MySQL socket path. Takes precedence over \fB\-\-port\fR. +.TP +\fB\-m\fR, \fB\-\-move_back\fR +Moving MyRocks backup files to proper locations. +.TP +\fB\-r\fR ROCKSDB_DATADIR, \fB\-\-rocksdb_datadir\fR=\fI\,ROCKSDB_DATADIR\/\fR +RocksDB target data directory where backup data files +will be moved. Must be empty. +.TP +\fB\-w\fR ROCKSDB_WALDIR, \fB\-\-rocksdb_waldir\fR=\fI\,ROCKSDB_WALDIR\/\fR +RocksDB target data directory where backup wal files +will be moved. Must be empty. +.TP +\fB\-b\fR BACKUPDIR, \fB\-\-backup_dir\fR=\fI\,BACKUPDIR\/\fR +backup mode for WDT: Remote directory to store backup. +move_back mode: Locations where backup files are +stored. +.TP +\fB\-f\fR, \fB\-\-skip_check_frm_timestamp\fR +skipping to check if frm files are updated after +starting backup. +.TP +\fB\-D\fR DEBUG_SIGNAL_FILE, \fB\-\-debug_signal_file\fR=\fI\,DEBUG_SIGNAL_FILE\/\fR +debugging purpose: waiting until the specified file is +created +.SH "SEE ALSO" +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ +.SH AUTHOR +MariaDB Foundation (http://www.mariadb.org/). diff --git a/storage/rocksdb/mysql-test/rocksdb/include/rocksdb_icp.inc b/storage/rocksdb/mysql-test/rocksdb/include/rocksdb_icp.inc index c76b52d4..bf593ec9 100644 --- a/storage/rocksdb/mysql-test/rocksdb/include/rocksdb_icp.inc +++ b/storage/rocksdb/mysql-test/rocksdb/include/rocksdb_icp.inc @@ -49,7 +49,7 @@ insert into t3 select a,a/10,a,a from t1; explain select * from t3 where kp1=3 and kp2 like '%foo%'; ---replace_column 9 # +--source include/explain-no-costs.inc explain format=json select * from t3 where kp1 between 2 and 4 and mod(kp1,3)=0 and kp2 like '%foo%'; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars_thread_2.result b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars_thread_2.result index 6bd6cea9..a14ffdec 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars_thread_2.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars_thread_2.result @@ -92,7 +92,5 @@ disconnect con2; disconnect con1; disconnect con0; SELECT * FROM t1 ORDER BY pk INTO OUTFILE <output_file>; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead All pk values matched their expected values DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter4.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter4.result index c4a1c5f4..1f4d1a64 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter4.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter4.result @@ -20,8 +20,6 @@ END IF; SET id1_cond = id1_cond + 1; END WHILE; END// -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead "Skipping bloom filter" SET session rocksdb_skip_bloom_filter_on_read=1; CALL select_test(); diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result index 4a1fc173..3010e220 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result @@ -928,7 +928,7 @@ y2 YEAR(2) NOT NULL, pk DATETIME PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra d date NO NULL @@ -1170,7 +1170,7 @@ DROP TABLE IF EXISTS t1; #---------------------------------- CREATE TABLE t1 (pk INT AUTO_INCREMENT PRIMARY KEY, c YEAR(2) NOT NULL) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra pk int(11) NO PRI NULL auto_increment @@ -1190,7 +1190,7 @@ pk INT AUTO_INCREMENT PRIMARY KEY, c YEAR(2) NOT NULL DEFAULT '12' ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra pk int(11) NO PRI NULL auto_increment diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result index d97fb8a2..14170e2a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result @@ -818,7 +818,7 @@ y2 YEAR(2) NULL, pk DATETIME PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra d date YES NULL @@ -1003,9 +1003,9 @@ c2 YEAR(2) NULL DEFAULT '12', pk INT AUTO_INCREMENT PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra c year(2) YES NULL diff --git a/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result b/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result index 19521533..e5f463a6 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result @@ -34,7 +34,7 @@ id bigfield 33 yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy include/assert.inc [Not eligible for optimization, access via fake_id of big row.: 0 rocksdb_covered_secondary_key_lookups] DROP TABLE t1; -set session debug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; CREATE TABLE t1 ( id INT, fake_id INT, @@ -43,7 +43,7 @@ PRIMARY KEY (id), KEY bf (bigfield(32)), KEY fid (fake_id, bigfield(32)) ) ENGINE=rocksdb; -set session debug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; INSERT INTO t1 VALUES (1, 1001, REPEAT('a', 1)), (8, 1008, REPEAT('b', 8)), (24, 1024, REPEAT('c', 24)), diff --git a/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result b/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result index 4386ad59..cb632d02 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result @@ -3,7 +3,7 @@ pk int not null primary key, col1 varchar(10) ) engine=rocksdb; insert into t1 values (1,1),(2,2),(3,3); -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; select * from t1 where pk=1; # testing unclean shutdown on stuck instance # Run shutdown sql command with forcing kill (exit code 127) @@ -27,7 +27,7 @@ ERROR HY000: Only read_only instance can be killed. SHUTDOWN 127; Got one of the listed errors # restart the server -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; select * from t1 where pk=1; SET GLOBAL read_only=1; # verifying SHUTDOWN read_only works with read_only instance diff --git a/storage/rocksdb/mysql-test/rocksdb/r/innodb_i_s_tables_disabled.result b/storage/rocksdb/mysql-test/rocksdb/r/innodb_i_s_tables_disabled.result index d99c9b11..4b8e3802 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/innodb_i_s_tables_disabled.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/innodb_i_s_tables_disabled.result @@ -96,12 +96,8 @@ buffer_LRU_unzip_search_num_scan buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL N buffer_LRU_unzip_search_scanned_per_call buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 set_member Page scanned per single LRU unzip search buffer_page_read_index_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Index Leaf Pages read buffer_page_read_index_non_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Index Non-leaf Pages read -buffer_page_read_index_ibuf_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Index Leaf Pages read -buffer_page_read_index_ibuf_non_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Index Non-Leaf Pages read buffer_page_read_undo_log buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Undo Log Pages read buffer_page_read_index_inode buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Index Inode Pages read -buffer_page_read_ibuf_free_list buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Free List Pages read -buffer_page_read_ibuf_bitmap buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Bitmap Pages read buffer_page_read_system_page buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of System Pages read buffer_page_read_trx_system buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Transaction System Pages read buffer_page_read_fsp_hdr buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of File Space Header Pages read @@ -112,12 +108,8 @@ buffer_page_read_zblob2 buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NU buffer_page_read_other buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of other/unknown (old version of InnoDB) Pages read buffer_page_written_index_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Index Leaf Pages written buffer_page_written_index_non_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Index Non-leaf Pages written -buffer_page_written_index_ibuf_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Index Leaf Pages written -buffer_page_written_index_ibuf_non_leaf buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Index Non-Leaf Pages written buffer_page_written_undo_log buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Undo Log Pages written buffer_page_written_index_inode buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Index Inode Pages written -buffer_page_written_ibuf_free_list buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Free List Pages written -buffer_page_written_ibuf_bitmap buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Insert Buffer Bitmap Pages written buffer_page_written_system_page buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of System Pages written buffer_page_written_trx_system buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Transaction System Pages written buffer_page_written_fsp_hdr buffer_page_io 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of File Space Header Pages written @@ -185,14 +177,6 @@ adaptive_hash_rows_removed adaptive_hash_index 0 NULL NULL NULL 0 NULL NULL NULL adaptive_hash_rows_deleted_no_hash_entry adaptive_hash_index 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of rows deleted that did not have corresponding Adaptive Hash Index entries adaptive_hash_rows_updated adaptive_hash_index 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of Adaptive Hash Index rows updated file_num_open_files file_system 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 value Number of files currently open (innodb_num_open_files) -ibuf_merges_insert change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of inserted records merged by change buffering -ibuf_merges_delete_mark change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of deleted records merged by change buffering -ibuf_merges_delete change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of purge records merged by change buffering -ibuf_merges_discard_insert change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of insert merged operations discarded -ibuf_merges_discard_delete_mark change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of deleted merged operations discarded -ibuf_merges_discard_delete change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of purge merged operations discarded -ibuf_merges change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of change buffer merges -ibuf_size change_buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Change buffer size in pages innodb_master_thread_sleeps server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of times (seconds) master thread sleeps innodb_activity_count server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Current server activity count innodb_master_active_loops server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of times master thread performs its tasks when server is active diff --git a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result index 730e12d0..6645a33e 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result @@ -39,8 +39,8 @@ a varchar(10) NOT NULL, e int(11) DEFAULT 0, KEY (a) ) ENGINE=ROCKSDB DEFAULT CHARSET=utf8; -insert into t1 values (1,1,1),(2,2,2); -explain select a from t1 where a <'zzz'; +insert into t1 values (1,"a",1),(2,"b",2),(3,"c",2); +explain select a from t1 where a <'b'; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range a a 32 NULL # Using where CREATE TABLE t2( diff --git a/storage/rocksdb/mysql-test/rocksdb/r/no_merge_sort.result b/storage/rocksdb/mysql-test/rocksdb/r/no_merge_sort.result index 6ea13872..3a631d29 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/no_merge_sort.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/no_merge_sort.result @@ -1,123 +1,63 @@ Warnings: Note 1051 Unknown table 'test.ti_nk' -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead skip_merge_sort true DROP TABLE ti_nk; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result index 989d28e7..0c9d29ef 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result @@ -278,12 +278,12 @@ j 1 4 EXPLAIN -SELECT * FROM t10, t11 WHERE i=j; +SELECT * FROM t11 straight_join t10 WHERE i=j; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t10 index PRIMARY PRIMARY 4 NULL # Using index -1 SIMPLE t11 eq_ref PRIMARY PRIMARY 4 test.t10.i # Using index -SELECT * FROM t10, t11 WHERE i=j; -i j +1 SIMPLE t11 index PRIMARY PRIMARY 4 NULL # Using index +1 SIMPLE t10 eq_ref PRIMARY PRIMARY 4 test.t11.j # Using index +SELECT * FROM t11 straight_join t10 WHERE i=j; +j i 1 1 DROP TABLE t10,t11; # diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp.result index f9e3129c..a4717570 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp.result @@ -47,6 +47,7 @@ EXPLAIN { "query_block": { "select_id": 1, + "cost": "COST_REPLACED", "nested_loop": [ { "table": { @@ -56,7 +57,9 @@ EXPLAIN "key": "kp1", "key_length": "5", "used_key_parts": ["kp1"], + "loops": 1, "rows": 1000, + "cost": "COST_REPLACED", "filtered": 100, "index_condition": "t3.kp1 between 2 and 4 and t3.kp1 MOD 3 = 0", "attached_condition": "t3.kp2 like '%foo%'" diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp_rev.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp_rev.result index 3634f8c0..07bce244 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp_rev.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_icp_rev.result @@ -47,6 +47,7 @@ EXPLAIN { "query_block": { "select_id": 1, + "cost": "COST_REPLACED", "nested_loop": [ { "table": { @@ -56,7 +57,9 @@ EXPLAIN "key": "kp1", "key_length": "5", "used_key_parts": ["kp1"], + "loops": 1, "rows": 1000, + "cost": "COST_REPLACED", "filtered": 100, "index_condition": "t3.kp1 between 2 and 4 and t3.kp1 MOD 3 = 0", "attached_condition": "t3.kp2 like '%foo%'" diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result index 8cdfa910..f54bb086 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result @@ -19,12 +19,12 @@ insert into t2 select a,a,a,a from t1; create table t3 like t2; insert into t3 select * from t2; include/sync_slave_sql_with_master.inc -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0; set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t2 where pk=2; delete from t2 where pk=3; @@ -35,13 +35,13 @@ pk kp1 kp2 col1 0 0 0 0 1 1 1 1 4 4 4 4 -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0; call mtr.add_suppression("Deadlock found when trying to get lock"); set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t3 where pk=2; delete from t3 where pk=3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result index 8cdfa910..f54bb086 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result @@ -19,12 +19,12 @@ insert into t2 select a,a,a,a from t1; create table t3 like t2; insert into t3 select * from t2; include/sync_slave_sql_with_master.inc -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0; set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t2 where pk=2; delete from t2 where pk=3; @@ -35,13 +35,13 @@ pk kp1 kp2 col1 0 0 0 0 1 1 1 1 4 4 4 4 -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0; call mtr.add_suppression("Deadlock found when trying to get lock"); set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t3 where pk=2; delete from t3 where pk=3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/select.result b/storage/rocksdb/mysql-test/rocksdb/r/select.result index 7ea43adc..fc3825d5 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/select.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/select.result @@ -115,8 +115,6 @@ SELECT t1.a, t2.b FROM t2, t1 WHERE t1.a = t2.a ORDER BY t2.b, t1.a INTO OUTFILE '<DATADIR>/select.out' CHARACTER SET utf8 FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY ''''; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead 200,'bar' 200,'bar' 100,'foobar' @@ -128,12 +126,8 @@ INTO DUMPFILE '<DATADIR>/select.dump'; ERROR 42000: Result consisted of more than one row SELECT t1.*, t2.* FROM t1, t2 ORDER BY t2.b, t1.a, t2.a, t1.b, t1.pk, t2.pk LIMIT 1 INTO DUMPFILE '<DATADIR>/select.dump'; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead 1z2200bar3 SELECT MIN(a), MAX(a) FROM t1 INTO @min, @max; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead SELECT @min, @max; @min @max 1 200 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result b/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result index 60d9f69a..656cd346 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result @@ -4,13 +4,13 @@ insert into mz values(1); affected rows: 1 commit; affected rows: 0 -SET debug= '+d,abort_with_io_write_error'; +SET debug_dbug= '+d,abort_with_io_write_error'; affected rows: 0 set global binlog_error_action=1; affected rows: 0 -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug d,abort_with_io_write_error +debug_dbug d,abort_with_io_write_error affected rows: 1 show global variables like 'binlog_error_action'; Variable_name Value diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_char_indexes.result b/storage/rocksdb/mysql-test/rocksdb/r/type_char_indexes.result index 3c9c30bb..39413ea5 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_char_indexes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_char_indexes.result @@ -45,7 +45,7 @@ t1 1 v16 1 v16 A 500 NULL NULL YES LSMTREE NO INSERT INTO t1 (c,c20,v16,v128,pk) VALUES ('a','char1','varchar1a','varchar1b','1'),('a','char2','varchar2a','varchar2b','2'),('b','char3','varchar1a','varchar1b','3'),('c','char4','varchar3a','varchar3b','4'); EXPLAIN SELECT SUBSTRING(v16,0,3) FROM t1 WHERE v16 LIKE 'varchar%'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range v16 v16 19 NULL # Using where; Using index +1 SIMPLE t1 index v16 v16 19 NULL # Using where; Using index SELECT SUBSTRING(v16,7,3) FROM t1 WHERE v16 LIKE 'varchar%'; SUBSTRING(v16,7,3) r1a diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result b/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result index 91e7ac25..5c00c041 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result @@ -12,7 +12,7 @@ y2 YEAR(2) , pk DATETIME PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra d date YES NULL diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_date_time_indexes.result b/storage/rocksdb/mysql-test/rocksdb/r/type_date_time_indexes.result index bd40e32f..5e896486 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_date_time_indexes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_date_time_indexes.result @@ -62,7 +62,7 @@ INSERT INTO t1 (d,dt,ts,t,y,pk) VALUES (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),'12:05:00'); EXPLAIN SELECT ts FROM t1 WHERE ts > NOW(); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range ts ts 5 NULL # Using where; Using index +1 SIMPLE t1 index ts ts 5 NULL # Using where; Using index SELECT ts FROM t1 WHERE ts > NOW(); ts EXPLAIN SELECT ts FROM t1 USE INDEX () WHERE ts > NOW(); diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_enum_indexes.result b/storage/rocksdb/mysql-test/rocksdb/r/type_enum_indexes.result index b0bcfd70..011fa089 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_enum_indexes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_enum_indexes.result @@ -49,7 +49,7 @@ t1 0 PRIMARY 1 pk A 1000 NULL NULL LSMTREE NO t1 1 b 1 b A 500 NULL NULL YES LSMTREE NO EXPLAIN SELECT DISTINCT b FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL b 2 NULL # +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using temporary SELECT DISTINCT b FROM t1; b test1 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_float_indexes.result b/storage/rocksdb/mysql-test/rocksdb/r/type_float_indexes.result index 89dc65e5..a98f90f2 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_float_indexes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_float_indexes.result @@ -114,7 +114,7 @@ INSERT INTO t1 (f,r,d,dp,pk) VALUES (4644,1422.22,466664.999,0.5,5); EXPLAIN SELECT DISTINCT d FROM t1 ORDER BY d; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL d 9 NULL # Using index for group-by +1 SIMPLE t1 index NULL d 9 NULL # Using index SELECT DISTINCT d FROM t1 ORDER BY d; d -1 @@ -177,7 +177,7 @@ INSERT INTO t1 (f,r,d,dp,pk) VALUES (1.2345,0,0,0,6); EXPLAIN SELECT DISTINCT f FROM t1 ORDER BY f; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL f 5 NULL # Using index for group-by +1 SIMPLE t1 index NULL f 5 NULL # Using index SELECT DISTINCT f FROM t1 ORDER BY f; f -1 diff --git a/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test b/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test index ccd91a61..85a36683 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test @@ -45,7 +45,7 @@ DROP TABLE t1; # Create same table with older format to test compatibility # -set session debug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; CREATE TABLE t1 ( id INT, fake_id INT, @@ -54,7 +54,7 @@ CREATE TABLE t1 ( KEY bf (bigfield(32)), KEY fid (fake_id, bigfield(32)) ) ENGINE=rocksdb; -set session debug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; INSERT INTO t1 VALUES (1, 1001, REPEAT('a', 1)), (8, 1008, REPEAT('b', 8)), diff --git a/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test b/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test index 1817bc06..19d0bf40 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test @@ -13,7 +13,7 @@ create table t1 ( insert into t1 values (1,1),(2,2),(3,3); connection conn1; -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; send select * from t1 where pk=1; --echo # testing unclean shutdown on stuck instance @@ -70,7 +70,7 @@ SHUTDOWN 127; connect (conn2, localhost, root,,test); connection conn2; -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; send select * from t1 where pk=1; connection default; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test b/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test index 99d4e2d1..da4ac350 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test @@ -37,9 +37,9 @@ CREATE TABLE t1( e int(11) DEFAULT 0, KEY (a) ) ENGINE=ROCKSDB DEFAULT CHARSET=utf8; -insert into t1 values (1,1,1),(2,2,2); +insert into t1 values (1,"a",1),(2,"b",2),(3,"c",2); --replace_column 9 # -explain select a from t1 where a <'zzz'; +explain select a from t1 where a <'b'; CREATE TABLE t2( pk int, diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test index f7de167b..9b24ad95 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test @@ -266,8 +266,8 @@ select * from t10; select * from t11; --replace_column 9 # EXPLAIN -SELECT * FROM t10, t11 WHERE i=j; -SELECT * FROM t10, t11 WHERE i=j; +SELECT * FROM t11 straight_join t10 WHERE i=j; +SELECT * FROM t11 straight_join t10 WHERE i=j; DROP TABLE t10,t11; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc b/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc index 9575abb7..3ef3cae0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc +++ b/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc @@ -45,7 +45,7 @@ set binlog_format=@tmp_binlog_format; --source include/sync_slave_sql_with_master.inc connection slave; -let $old_debug = `select @@global.debug`; +let $old_debug = `select @@global.debug_dbug`; set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; --source include/stop_slave.inc --source include/start_slave.inc diff --git a/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test b/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test index 451eed05..ac085893 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test @@ -19,13 +19,13 @@ insert into mz values(1); commit; # simulate a write error -SET debug= '+d,abort_with_io_write_error'; +SET debug_dbug= '+d,abort_with_io_write_error'; # we want to abort server if we fail to write (ABORT_SERVER) set global binlog_error_action=1; # diplay the values of the key parameters -show session variables like 'debug'; +show session variables like 'debug_dbug'; show global variables like 'binlog_error_action'; show global variables like 'skip_core_dump_on_error'; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test b/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test index 6ee2f03e..fcdf9b1f 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test @@ -63,13 +63,6 @@ EXPLAIN SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128 --sorted_result SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128; -SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; ---replace_column 9 # -EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; ---sorted_result -SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; -SET SESSION optimizer_switch = @@global.optimizer_switch; - DROP TABLE t1; --enable_parsing diff --git a/storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf b/storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf index 101dbce2..1a03c58a 100644 --- a/storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf +++ b/storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf @@ -1,6 +1,5 @@ # Use default setting for mysqld processes -!include include/default_mysqld.cnf -!include include/default_client.cnf +!include include/default_my.cnf [mysqld.1] rocksdb diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result index 493107ec..45ca980a 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result @@ -3,7 +3,7 @@ SET GLOBAL MAX_BINLOG_SIZE = 4096; SET GLOBAL ROCKSDB_ENABLE_2PC = ON; create table t1 (a int primary key, b int, c varchar(255)) engine=rocksdb; 'con1' -SET SESSION debug="d,crash_commit_after_log"; +SET SESSION debug_dbug="d,crash_commit_after_log"; SET DEBUG_SYNC='rocksdb.prepared SIGNAL parked WAIT_FOR go'; insert into t1 values (1, 1, "iamtheogthealphaandomega");; 'con2' diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result index 352ceff2..5c333cf8 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result @@ -12,10 +12,10 @@ select * from slave_gtid_info; Id Database_name Last_gtid 1 mtr uuid:1 2 test uuid:4 -SET GLOBAL debug = '+d,crash_before_update_pos'; +SET GLOBAL debug_dbug = '+d,crash_before_update_pos'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -58,10 +58,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_after_update_pos_before_apply'; +SET GLOBAL debug_dbug = '+d,crash_after_update_pos_before_apply'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -102,10 +102,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_before_writing_xid'; +SET GLOBAL debug_dbug = '+d,crash_before_writing_xid'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -146,10 +146,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,half_binlogged_transaction'; +SET GLOBAL debug_dbug = '+d,half_binlogged_transaction'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -190,10 +190,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_before'; +SET GLOBAL debug_dbug = '+d,crash_commit_before'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -234,10 +234,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_log'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_log'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -278,10 +278,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_prepare'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_prepare'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -322,10 +322,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after'; +SET GLOBAL debug_dbug = '+d,crash_commit_after'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result index a518de2b..441d90c6 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result @@ -12,10 +12,10 @@ select * from slave_gtid_info; Id Database_name Last_gtid 1 mtr 2 test uuid:4 -SET GLOBAL debug = '+d,crash_before_update_pos'; +SET GLOBAL debug_dbug = '+d,crash_before_update_pos'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -58,10 +58,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_after_update_pos_before_apply'; +SET GLOBAL debug_dbug = '+d,crash_after_update_pos_before_apply'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -102,10 +102,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_before_writing_xid'; +SET GLOBAL debug_dbug = '+d,crash_before_writing_xid'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -146,10 +146,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,half_binlogged_transaction'; +SET GLOBAL debug_dbug = '+d,half_binlogged_transaction'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -190,10 +190,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_before'; +SET GLOBAL debug_dbug = '+d,crash_commit_before'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -234,10 +234,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_log'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_log'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -278,10 +278,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_prepare'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_prepare'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -322,10 +322,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after'; +SET GLOBAL debug_dbug = '+d,crash_commit_after'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result index 2b5c5300..47bb9e23 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result @@ -5,11 +5,11 @@ Note #### Storing MySQL user name or password information in the master info rep [connection master] create table t1 (a int primary key) engine=rocksdb; insert into t1 values(1); -SET GLOBAL debug = '+d,crash_before_writing_xid'; +SET GLOBAL debug_dbug = '+d,crash_before_writing_xid'; insert into t1 values(2); ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; include/start_slave.inc RocksDB: Last MySQL Gtid master_uuid:2 drop table t1; diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result index 0eadc7de..5da619eb 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result @@ -8,12 +8,12 @@ set @save.slave_parallel_workers= @@global.slave_parallel_workers; set @save.slave_use_idempotent_for_recovery= @@global.slave_use_idempotent_for_recovery; set @save.mts_dependency_replication= @@global.mts_dependency_replication; set @save.mts_dependency_order_commits= @@global.mts_dependency_order_commits; -set @save.debug= @@global.debug; +set @save.debug_dbug= @@global.debug_dbug; set @@global.slave_parallel_workers= 2; set @@global.slave_use_idempotent_for_recovery= YES; set @@global.mts_dependency_replication= STMT; set @@global.mts_dependency_order_commits= false; -set @@global.debug= '+d,dbug.dep_wait_before_update_execution'; +set @@global.debug_dbug= '+d,dbug.dep_wait_before_update_execution'; include/start_slave.inc create table t1 (a int primary key, b int unique key) engine = rocksdb; insert into t1 values(1, 1); @@ -39,6 +39,6 @@ set @@global.slave_parallel_workers= @save.slave_parallel_workers; set @@global.mts_dependency_replication= @save.mts_dependency_replication; set @@global.slave_use_idempotent_for_recovery= @save.slave_use_idempotent_for_recovery; set @@global.mts_dependency_order_commits= @save.mts_dependency_order_commits; -set @@global.debug= @save.debug; +set @@global.debug_dbug= @save.debug_dbug; include/start_slave.inc include/rpl_end.inc diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf b/storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf index ed8c77bc..32be7f58 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf @@ -1,6 +1,5 @@ # Use default setting for mysqld processes -!include include/default_mysqld.cnf -!include include/default_client.cnf +!include include/default_my.cnf [mysqld.1] diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test index ff484171..fc97361c 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test @@ -31,7 +31,7 @@ connect (con2, localhost, root,,); connection con1; --echo 'con1' --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="d,crash_commit_after_log"; +SET SESSION debug_dbug="d,crash_commit_after_log"; SET DEBUG_SYNC='rocksdb.prepared SIGNAL parked WAIT_FOR go'; --error 0,2013 --send insert into t1 values (1, 1, "iamtheogthealphaandomega"); diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test index d1793c4a..dc324aef 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test @@ -5,12 +5,12 @@ source include/have_gtid.inc; source include/have_debug.inc; source include/not_valgrind.inc; ---let $old_debug = `select @@global.debug;` +--let $old_debug = `select @@global.debug_dbug;` connection master; create table t1 (a int primary key) engine=rocksdb; insert into t1 values(1); ---eval SET GLOBAL debug = '+d,crash_before_writing_xid' +--eval SET GLOBAL debug_dbug = '+d,crash_before_writing_xid' --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --error 2013 insert into t1 values(2); @@ -19,7 +19,7 @@ insert into t1 values(2); --let $rpl_server_number = 1 --source include/rpl_reconnect.inc ---eval SET GLOBAL debug = `$old_debug` +--eval SET GLOBAL debug_dbug = `$old_debug` connection slave; disable_warnings; diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf index 92ed7198..b7ad3a73 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf @@ -1,4 +1,4 @@ -!include include/default_mysqld.cnf +!include include/default_my.cnf [mysqld.1] binlog_row_image = COMPLETE diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test index 5869b9a3..cece6a88 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test @@ -9,12 +9,12 @@ set @save.slave_parallel_workers= @@global.slave_parallel_workers; set @save.slave_use_idempotent_for_recovery= @@global.slave_use_idempotent_for_recovery; set @save.mts_dependency_replication= @@global.mts_dependency_replication; set @save.mts_dependency_order_commits= @@global.mts_dependency_order_commits; -set @save.debug= @@global.debug; +set @save.debug_dbug= @@global.debug_dbug; set @@global.slave_parallel_workers= 2; set @@global.slave_use_idempotent_for_recovery= YES; set @@global.mts_dependency_replication= STMT; set @@global.mts_dependency_order_commits= false; -set @@global.debug= '+d,dbug.dep_wait_before_update_execution'; +set @@global.debug_dbug= '+d,dbug.dep_wait_before_update_execution'; source include/start_slave.inc; connection master; @@ -58,7 +58,7 @@ set @@global.slave_parallel_workers= @save.slave_parallel_workers; set @@global.mts_dependency_replication= @save.mts_dependency_replication; set @@global.slave_use_idempotent_for_recovery= @save.slave_use_idempotent_for_recovery; set @@global.mts_dependency_order_commits= @save.mts_dependency_order_commits; -set @@global.debug= @save.debug; +set @@global.debug_dbug= @save.debug_dbug; source include/start_slave.inc; source include/rpl_end.inc; diff --git a/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py b/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py index 91dd9e90..eef50010 100644 --- a/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py +++ b/storage/rocksdb/mysql-test/rocksdb_stress/t/load_generator.py @@ -230,14 +230,14 @@ class WorkerThread(threading.Thread): return self.con is None def get_isolation_level(self): - execute(self.cur, "SELECT @@SESSION.tx_isolation") + execute(self.cur, "SELECT @@SESSION.transaction_isolation") if self.cur.rowcount != 1: - raise TestError("Unable to retrieve tx_isolation") + raise TestError("Unable to retrieve transaction_isolation") return self.cur.fetchone()[0] def set_isolation_level(self, isolation_level, persist = False): if isolation_level is not None: - execute(self.cur, "SET @@SESSION.tx_isolation = '%s'" % isolation_level) + execute(self.cur, "SET @@SESSION.transaction_isolation = '%s'" % isolation_level) if self.cur.rowcount != 0: raise TestError("Unable to set the isolation level to %s") diff --git a/storage/rocksdb/rdb_i_s.cc b/storage/rocksdb/rdb_i_s.cc index c830c59a..326d7b45 100644 --- a/storage/rocksdb/rdb_i_s.cc +++ b/storage/rocksdb/rdb_i_s.cc @@ -74,6 +74,7 @@ using SLong = Show::SLong; using SLonglong = Show::SLonglong; using ULonglong = Show::ULonglong; using Double = Show::Double; +using STiny = Show::STiny; static ST_FIELD_INFO rdb_i_s_cfstats_fields_info[] = { diff --git a/storage/rocksdb/tools/mysql_ldb.cc b/storage/rocksdb/tools/mysql_ldb.cc index b1eec03f..454b7a63 100644 --- a/storage/rocksdb/tools/mysql_ldb.cc +++ b/storage/rocksdb/tools/mysql_ldb.cc @@ -8,6 +8,7 @@ #include "rocksdb/ldb_tool.h" int main(int argc, char **argv) { + MY_INIT(argv[0]); rocksdb::Options db_options; myrocks::Rdb_pk_comparator pk_comparator; db_options.comparator = &pk_comparator; |