mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
91faec36f9
- Cleanup of mysqltest.c before extending it client/mysqltest.c: Cleanup functions run_query_* before adding new functionality. Break out common functions used in both run_query_stmt and run_query_normal Move functionality for all run_query_* calls into run_query Since the normal way of handling an unepected error is to call die(which will never return), remove all return values from functions that does not return. Add comments. Remove unused vars. Cleanup... Removed oboslete syntax @<file_name>, "require" or "result" should be used. mysql-test/include/master-slave.inc: remove obsolete syntax @, use "require" command mysql-test/include/ps_query.inc: Remove this comment, mysqltest will now produce output. Old mysqltest didn't return any output since command starting with @ was treated as a require. Uggh. mysql-test/r/mysqltest.result: Update test result mysql-test/r/ps_2myisam.result: Update test result mysql-test/r/ps_3innodb.result: Update test result mysql-test/r/ps_4heap.result: Update test result mysql-test/r/ps_5merge.result: Update test result mysql-test/r/ps_6bdb.result: Update test result mysql-test/r/ps_7ndb.result: Update test result mysql-test/t/alias.test: Remove --disable/enable_ps_protocol, only used to mask bugs in mysqltest mysql-test/t/group_by.test: Remove --disable/enable_ps_protocol, only used to mask bugs in mysqltest mysql-test/t/mysqltest.test: Add test for "Missing delimiter until eof" mysql-test/t/union.test: Remove --disable/enable_ps_protocol, "select found_rows" works with ps_protocol now!
29 lines
872 B
PHP
29 lines
872 B
PHP
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
|
|
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
|
|
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
|
|
connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
|
|
connection slave;
|
|
#we expect STOP SLAVE to produce a warning as the slave is stopped
|
|
#(the server was started with skip-slave-start)
|
|
--disable_warnings
|
|
stop slave;
|
|
--enable_warnings
|
|
--require r/slave-stopped.result
|
|
show status like 'Slave_running';
|
|
connection master;
|
|
--disable_warnings
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
--enable_warnings
|
|
reset master;
|
|
connection slave;
|
|
reset slave;
|
|
# Clean up old test tables
|
|
--disable_warnings
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
--enable_warnings
|
|
start slave;
|
|
--require r/slave-running.result
|
|
show status like 'Slave_running';
|
|
|
|
# Set the default connection to 'master'
|
|
connection master;
|