revision-id: 40bed2d39e0409d3a1ff468f792ec00ae0c8e7df parent(s): ce4149fc9b5eda464919cefb6ea22d02879a6882 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-16 11:06:43 +0300 message: MyRocks: Add files lost during the merge Include files that upstream has in mysql-test/include and so they were not picked up by the merge process --- .../rocksdb/include/restart_mysqld_with_invalid_option.inc | 8 ++++++++ .../rocksdb/include/start_mysqld_with_option.inc | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_invalid_option.inc b/storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_invalid_option.inc new file mode 100644 index 0000000..8eef7ed --- /dev/null +++ b/storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_invalid_option.inc @@ -0,0 +1,8 @@ +--source include/shutdown_mysqld.inc + +# Expect the server to fail to come up with these options +--error 1 +--exec $MYSQLD_CMD --plugin_load=$HA_ROCKSDB_SO $_mysqld_option + +# Restart the server with the default options +--source include/start_mysqld.inc diff --git a/storage/rocksdb/mysql-test/rocksdb/include/start_mysqld_with_option.inc b/storage/rocksdb/mysql-test/rocksdb/include/start_mysqld_with_option.inc new file mode 100644 index 0000000..73e30b3 --- /dev/null +++ b/storage/rocksdb/mysql-test/rocksdb/include/start_mysqld_with_option.inc @@ -0,0 +1,14 @@ +# Include this script only after using shutdown_mysqld.inc +# where $_expect_file_name was initialized. +# Write file to make mysql-test-run.pl start up the server again +--exec echo "restart:$_mysqld_option" > $_expect_file_name + +# Turn on reconnect +--enable_reconnect + +# Call script that will poll the server waiting for it to be back online again +--source include/wait_until_connected_again.inc + +# Turn off reconnect again +--disable_reconnect +