Post-merge fixes

- Fix rocksdb.rocksdb test
- Update rocksdb.autoinc_crash_safe_partition* tests

storage/rocksdb/mysql-test/rocksdb/r/autoinc_crash_safe.result

 include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 create table t (i int primary key auto_increment) engine=rocksdb;
 #
 # Testing concurrent transactions.
 #
+connect  con1,localhost,root,,;
+connect  con2,localhost,root,,;
+connect  con3,localhost,root,,;
+connection con1;
 begin;
 insert into t values ();
+connection con2;
 begin;
 insert into t values ();
+connection con3;
 begin;
 insert into t values ();
+connection con1;
 insert into t values ();
+connection con2;
 insert into t values ();
+connection con3;
 insert into t values ();
+connection con2;
 commit;
+connection con3;
 rollback;
+connection con1;
 commit;
 delete from t;
 # Master value before restart
@@ -25,25 +34,34 @@ select table_schema, table_name, auto_increment from information_schema.tables w
 table_schema	table_name	auto_increment
 test	t	7
 # Slave value before restart
+connection slave;
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
 table_schema	table_name	auto_increment
 test	t	6
+connection slave;
 include/stop_slave.inc
 include/rpl_restart_server.inc [server_number=1]
+connection default;
 # Master value after restart
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
 table_schema	table_name	auto_increment
 test	t	6
 include/rpl_restart_server.inc [server_number=2]
+connection slave;
 include/start_slave.inc
 # Slave value after restart
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
 table_schema	table_name	auto_increment
 test	t	6
+disconnect con1;
+disconnect con2;
+disconnect con3;
 #
 # Testing interaction of merge markers with various DDL statements.
 #
+connection slave;
 include/stop_slave.inc
+connection default;
 # Drop and add primary key.
 alter table t modify i int;
 alter table t drop primary key;
@@ -109,5 +127,6 @@ test	t	16
 # Drop table.
 drop table t;
 include/rpl_restart_server.inc [server_number=1]
+connection slave;
 include/start_slave.inc
 include/rpl_end.inc

storage/rocksdb/mysql-test/rocksdb/r/autoinc_crash_safe_partition.result

 include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 create table t (i int primary key auto_increment) engine=rocksdb partition by key (i) partitions 3;
 #
 # Testing concurrent transactions.
 #
+connect  con1,localhost,root,,;
+connect  con2,localhost,root,,;
+connect  con3,localhost,root,,;
+connection con1;
 begin;
 insert into t values ();
+connection con2;
 begin;
 insert into t values ();
+connection con3;
 begin;
 insert into t values ();
+connection con1;
 insert into t values ();
+connection con2;
 insert into t values ();
+connection con3;
 insert into t values ();
+connection con2;
 commit;
+connection con3;
 rollback;
+connection con1;
 commit;
 delete from t;
 # Master value before restart
@@ -25,25 +34,34 @@ select table_schema, table_name, auto_increment from information_schema.tables w
 table_schema	table_name	auto_increment
 test	t	7
 # Slave value before restart
+connection slave;
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
 table_schema	table_name	auto_increment
 test	t	6
+connection slave;
 include/stop_slave.inc
 include/rpl_restart_server.inc [server_number=1]
+connection default;
 # Master value after restart
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
 table_schema	table_name	auto_increment
 test	t	6
 include/rpl_restart_server.inc [server_number=2]
+connection slave;
 include/start_slave.inc
 # Slave value after restart
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
 table_schema	table_name	auto_increment
 test	t	6
+disconnect con1;
+disconnect con2;
+disconnect con3;
 #
 # Testing interaction of merge markers with various DDL statements.
 #
+connection slave;
 include/stop_slave.inc
+connection default;
 # Drop and add primary key.
 alter table t modify i int;
 alter table t drop primary key;
@@ -109,5 +127,6 @@ test	t	16
 # Drop table.
 drop table t;
 include/rpl_restart_server.inc [server_number=1]
+connection slave;
 include/start_slave.inc
 include/rpl_end.inc

storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result

@@ -862,9 +862,10 @@ ERROR 42S02: Unknown table 'test.t45'
 # Now it fails if there is data overlap with what
 # already exists
 #
-show variables where variable_name like 'rocksdb%' and variable_name not like 'rocksdb_max_open_files';
+show variables 
 where 
 variable_name like 'rocksdb%' and 
+variable_name not like 'rocksdb_max_open_files' and
 variable_name not like 'rocksdb_supported_compression_types';
 Variable_name	Value
 rocksdb_access_hint_on_compaction_start	1
@@ -1461,7 +1462,7 @@ Rocksdb_rows_read	#
 Rocksdb_rows_updated	#
 Rocksdb_rows_deleted_blind	#
 Rocksdb_rows_expired	#
-rocksdb_rows_filtered	#
+Rocksdb_rows_filtered	#
 Rocksdb_system_rows_deleted	#
 Rocksdb_system_rows_inserted	#
 Rocksdb_system_rows_read	#
@@ -1472,31 +1473,31 @@ Rocksdb_queries_point	#
 Rocksdb_queries_range	#
 Rocksdb_covered_secondary_key_lookups	#
 Rocksdb_block_cache_add	#
+Rocksdb_block_cache_add_failures	#
+Rocksdb_block_cache_bytes_read	#
+Rocksdb_block_cache_bytes_write	#
+Rocksdb_block_cache_data_add	#
+Rocksdb_block_cache_data_bytes_insert	#
 Rocksdb_block_cache_data_hit	#
-rocksdb_block_cache_add_failures	#
-rocksdb_block_cache_bytes_read	#
-rocksdb_block_cache_bytes_write	#
-rocksdb_block_cache_data_add	#
-rocksdb_block_cache_data_bytes_insert	#
 Rocksdb_block_cache_data_miss	#
+Rocksdb_block_cache_filter_add	#
+Rocksdb_block_cache_filter_bytes_evict	#
+Rocksdb_block_cache_filter_bytes_insert	#
 Rocksdb_block_cache_filter_hit	#
 Rocksdb_block_cache_filter_miss	#
 Rocksdb_block_cache_hit	#
+Rocksdb_block_cache_index_add	#
+Rocksdb_block_cache_index_bytes_evict	#
+Rocksdb_block_cache_index_bytes_insert	#
 Rocksdb_block_cache_index_hit	#
 Rocksdb_block_cache_index_miss	#
 Rocksdb_block_cache_miss	#
-rocksdb_block_cache_filter_add	#
-rocksdb_block_cache_filter_bytes_evict	#
-rocksdb_block_cache_filter_bytes_insert	#
 Rocksdb_block_cachecompressed_hit	#
 Rocksdb_block_cachecompressed_miss	#
 Rocksdb_bloom_filter_prefix_checked	#
 Rocksdb_bloom_filter_prefix_useful	#
 Rocksdb_bloom_filter_useful	#
 Rocksdb_bytes_read	#
-rocksdb_block_cache_index_add	#
-rocksdb_block_cache_index_bytes_evict	#
-rocksdb_block_cache_index_bytes_insert	#
 Rocksdb_bytes_written	#
 Rocksdb_compact_read_bytes	#
 Rocksdb_compact_write_bytes	#
@@ -1504,7 +1505,11 @@ Rocksdb_compaction_key_drop_new	#
 Rocksdb_compaction_key_drop_obsolete	#
 Rocksdb_compaction_key_drop_user	#
 Rocksdb_flush_write_bytes	#
+Rocksdb_get_hit_l0	#
+Rocksdb_get_hit_l1	#
+Rocksdb_get_hit_l2_and_up	#
 Rocksdb_getupdatessince_calls	#
+Rocksdb_iter_bytes_read	#
 Rocksdb_memtable_hit	#
 Rocksdb_memtable_miss	#
 Rocksdb_no_file_closes	#
@@ -1512,35 +1517,31 @@ Rocksdb_no_file_errors	#
 Rocksdb_no_file_opens	#
 Rocksdb_num_iterators	#
 Rocksdb_number_block_not_compressed	#
+Rocksdb_number_db_next	#
+Rocksdb_number_db_next_found	#
+Rocksdb_number_db_prev	#
+Rocksdb_number_db_prev_found	#
+Rocksdb_number_db_seek	#
+Rocksdb_number_db_seek_found	#
 Rocksdb_number_deletes_filtered	#
 Rocksdb_number_keys_read	#
 Rocksdb_number_keys_updated	#
 Rocksdb_number_keys_written	#
-rocksdb_get_hit_l0	#
-rocksdb_get_hit_l1	#
-rocksdb_get_hit_l2_and_up	#
 Rocksdb_number_merge_failures	#
 Rocksdb_number_multiget_bytes_read	#
 Rocksdb_number_multiget_get	#
 Rocksdb_number_multiget_keys_read	#
 Rocksdb_number_reseeks_iteration	#
 Rocksdb_number_sst_entry_delete	#
-rocksdb_iter_bytes_read	#
 Rocksdb_number_sst_entry_merge	#
 Rocksdb_number_sst_entry_other	#
 Rocksdb_number_sst_entry_put	#
 Rocksdb_number_sst_entry_singledelete	#
-Rocksdb_number_stat_computes	#
 Rocksdb_number_superversion_acquires	#
 Rocksdb_number_superversion_cleanups	#
 Rocksdb_number_superversion_releases	#
-rocksdb_number_db_next	#
-rocksdb_number_db_next_found	#
-rocksdb_number_db_prev	#
-rocksdb_number_db_prev_found	#
-rocksdb_number_db_seek	#
-rocksdb_number_db_seek_found	#
-Rocksdb_rate_limit_delay_millis	#
+Rocksdb_row_lock_deadlocks	#
+Rocksdb_row_lock_wait_timeouts	#
 Rocksdb_snapshot_conflict_errors	#
 Rocksdb_stall_l0_file_count_limit_slowdowns	#
 Rocksdb_stall_locked_l0_file_count_limit_slowdowns	#
@@ -1560,8 +1561,6 @@ Rocksdb_write_other	#
 Rocksdb_write_self	#
 Rocksdb_write_timedout	#
 Rocksdb_write_wal	#
-rocksdb_row_lock_deadlocks	#
-rocksdb_row_lock_wait_timeouts	#
 select VARIABLE_NAME from INFORMATION_SCHEMA.global_status where VARIABLE_NAME LIKE 'rocksdb%';
 VARIABLE_NAME
 ROCKSDB_ROWS_DELETED

storage/rocksdb/mysql-test/rocksdb/t/autoinc_crash_safe.cnf

@@ -5,4 +5,4 @@ binlog_format=row
 [mysqld.2]
 binlog_format=row
 slave_parallel_workers=1
-rpl_skip_tx_api=ON
+#rpl_skip_tx_api=ON

storage/rocksdb/mysql-test/rocksdb/t/autoinc_crash_safe.test

@@ -4,6 +4,6 @@
 
 create table t (i int primary key auto_increment) engine=rocksdb;
 
---source suite/rocksdb/include/autoinc_crash_safe.inc
+--source include/autoinc_crash_safe.inc
 
 --source include/rpl_end.inc

storage/rocksdb/mysql-test/rocksdb/t/autoinc_crash_safe_partition.cnf

@@ -4,5 +4,5 @@
 binlog_format=row
 [mysqld.2]
 binlog_format=row
-slave_parallel_workers=1
-rpl_skip_tx_api=ON
+#slave_parallel_workers=1
+#rpl_skip_tx_api=ON

storage/rocksdb/mysql-test/rocksdb/t/autoinc_crash_safe_partition.test

@@ -5,6 +5,6 @@
 
 create table t (i int primary key auto_increment) engine=rocksdb partition by key (i) partitions 3;
 
---source suite/rocksdb/include/autoinc_crash_safe.inc
+--source include/autoinc_crash_safe.inc
 
 --source include/rpl_end.inc

storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test

@@ -788,7 +788,6 @@ drop table t45;
 # We exclude rocksdb_max_open_files here because it value is dependent on
 # the value of the servers open_file_limit and is expected to be different
 # across distros and installs
-show variables where variable_name like 'rocksdb%' and variable_name not like 'rocksdb_max_open_files';
 
 --replace_regex /[a-f0-9]{40}/#/
 show variables