mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
7de98f2ffb
Changed test suite to use --log-basename (to get the code tested) Added --sync-sys=1 to test suite to speed it up. Better error messages if something goes wrong with mysql_install_db mysql-test/Makefile.am: Removed not existing directory mysql-test/lib/My/ConfigFactory.pm: Use log-basename We had to also set 'log_error' as some test was explicitely using the old name Added 'sync-sys=1' to speed up test suite mysql-test/r/variables-notembedded.result: Updated test results (variable relay_log is now set) mysql-test/suite/binlog/t/binlog_delete_and_flush_index-master.opt: Force specific names for some log files. mysql-test/suite/binlog/t/binlog_index-master.opt: Force specific names for some log files. mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt: Force specific names for some log files. mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test: Better error message if something goes wrong mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Updated results mysql-test/suite/rpl/rpl_1slave_base.cnf: Use --log-basename scripts/mysql_install_db.sh: More information to --help Write url to knowledge base if something goes wrong Fail at once if we can't create a database directory (no reason to continue and write a screenful of not related text) scripts/mysqld_safe.sh: Also allow one to use --data for --datadir (common shortening) Added support for --log-basename Fail at once if we can't create a log directory Fixed bug where we used a pid file name without '.pid' extension sql/log.cc: Create a log file name trough my_once_alloc() (To get it automaticly freed at exit) sql/mysql_priv.h: Added new prototype sql/mysqld.cc: Added support for --log-basename Better help for a lot of log-filename related variables. sql/rpl_rli.cc: Write information that one can use --log-basename sql/set_var.cc: Add log_basename as a readonly variable
50 lines
1.3 KiB
INI
50 lines
1.3 KiB
INI
# Use default setting for mysqld processes
|
|
!include include/default_mysqld.cnf
|
|
|
|
[mysqld.1]
|
|
|
|
# Run the master.sh script before starting this process
|
|
#!run-master-sh
|
|
|
|
log-basename= master
|
|
# log-bin= master-bin
|
|
# relay-log= master-relay-bin
|
|
|
|
[mysqld.2]
|
|
# Run the slave.sh script before starting this process
|
|
#!run-slave-sh
|
|
|
|
# Append <testname>-slave.opt file to the list of argument used when
|
|
# starting the mysqld
|
|
#!use-slave-opt
|
|
|
|
log-basename= slave
|
|
# relay-log= slave-relay-bin
|
|
|
|
init-rpl-role= slave
|
|
log-slave-updates
|
|
master-retry-count= 10
|
|
|
|
# Values reported by slave when it connect to master
|
|
# and shows up in SHOW SLAVE STATUS;
|
|
report-host= 127.0.0.1
|
|
report-port= @mysqld.2.port
|
|
report-user= root
|
|
|
|
skip-slave-start
|
|
|
|
# Directory where slaves find the dumps generated by "load data"
|
|
# on the server. The path need to have constant length otherwise
|
|
# test results will vary, thus a relative path is used.
|
|
slave-load-tmpdir= ../../tmp
|
|
|
|
loose-innodb
|
|
|
|
|
|
[ENV]
|
|
MASTER_MYPORT= @mysqld.1.port
|
|
MASTER_MYSOCK= @mysqld.1.socket
|
|
|
|
SLAVE_MYPORT= @mysqld.2.port
|
|
SLAVE_MYSOCK= @mysqld.2.socket
|
|
|