mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge next-mr -> next-4284.
mysql-test/t/disabled.def: Restore disabled ssl tests: SSL certificates were updated. Disable sp_sync.test, the test case can't work in next-4284. mysql-test/t/partition_innodb.test: Disable parsing of the test case for Bug#47343, the test can not work in next-4284. mysql-test/t/ps_ddl.test: Update results (CREATE TABLE IF NOT EXISTS takes into account existence of the temporary table).
This commit is contained in:
@ -44,3 +44,4 @@ log-bin=mysqld-bin
|
||||
# Run tests with the performance schema instrumentation
|
||||
loose-enable-performance-schema
|
||||
|
||||
binlog-direct-non-transactional-updates
|
||||
|
@ -77,12 +77,28 @@ copy_file $fake_relay_log $_fake_relay_log;
|
||||
|
||||
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
|
||||
{
|
||||
eval select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index';
|
||||
-- let $_index_entry= ./$_fake_filename-fake.000001
|
||||
}
|
||||
|
||||
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`)
|
||||
{
|
||||
eval select '.\\\\$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index';
|
||||
-- let $_index_entry= .\\\\$_fake_filename-fake.000001
|
||||
}
|
||||
|
||||
if (`SELECT LENGTH(@@secure_file_priv) > 0`)
|
||||
{
|
||||
-- let $_file_priv_dir= `SELECT @@secure_file_priv`;
|
||||
-- let $_suffix= `SELECT UUID()`
|
||||
-- let $_tmp_file= $_file_priv_dir/fake-index.$_suffix
|
||||
|
||||
-- eval select '$_index_entry\n' into dumpfile '$_tmp_file'
|
||||
-- copy_file $_tmp_file $_fake_relay_index
|
||||
-- remove_file $_tmp_file
|
||||
}
|
||||
|
||||
if (`SELECT LENGTH(@@secure_file_priv) = 0`)
|
||||
{
|
||||
-- eval select '$_index_entry\n' into dumpfile '$_fake_relay_index'
|
||||
}
|
||||
|
||||
# Setup replication from existing relay log.
|
||||
|
16
mysql-test/include/truncate_file.inc
Normal file
16
mysql-test/include/truncate_file.inc
Normal file
@ -0,0 +1,16 @@
|
||||
# truncate a giving file, all contents of the file are be cleared
|
||||
|
||||
if (`SELECT 'x$file' = 'x'`)
|
||||
{
|
||||
--echo Please assign a file name to $file!!
|
||||
exit;
|
||||
}
|
||||
|
||||
let TRUNCATE_FILE= $file;
|
||||
|
||||
perl;
|
||||
use Env;
|
||||
Env::import('TRUNCATE_FILE');
|
||||
open FILE, '>', $TRUNCATE_FILE || die "Can not open file $file";
|
||||
close FILE;
|
||||
EOF
|
Reference in New Issue
Block a user