|
| 1 | +--source include/have_mysqld_safe.inc |
1 | 2 | --source include/not_embedded.inc |
2 | 3 | --source include/not_windows.inc |
3 | 4 |
|
|
30 | 31 | #Remove the temp file |
31 | 32 | --remove_file $MYSQLTEST_VARDIR/tmp/mysqld_path_file.inc |
32 | 33 |
|
33 | | -# 2) Insert a check if mysqld_safe is existing. |
34 | | ---file_exists $MYSQLD_SAFE |
35 | | - |
36 | | -# 3) Shutdown mysqld which is started by mtr. |
| 34 | +# 2) Shutdown mysqld which is started by mtr. |
37 | 35 | --let $_server_id= `SELECT @@server_id` |
38 | 36 | --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect |
39 | 37 | --exec echo "wait" > $_expect_file_name |
40 | 38 | --shutdown_server |
41 | 39 | --source include/wait_until_disconnected.inc |
42 | 40 |
|
43 | 41 |
|
44 | | -# 4) Run the mysqld_safe script with exec. |
45 | | ---exec sh $MYSQLD_SAFE --defaults-file=$MYSQLTEST_VARDIR/my.cnf --log-error=$MYSQLTEST_VARDIR/log/err.log --basedir=$MYSQL_BASEDIR --ledir=$mysqld_path --datadir=$MYSQLD_DATADIR --secure-file-priv=$MYSQLTEST_VARDIR --socket=$MYSQL_SOCKET --pid-file=$MYSQL_PIDFILE --port=$MYSQL_PORT --timezone=SYSTEM --log-output=file --loose-debug-sync-timeout=600 --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB --loose-skip-log-bin --core-file --lc-messages-dir=$MYSQL_MESSAGESDIR --innodb-page-size=$other_page_size_nk < /dev/null > /dev/null 2>&1 & |
| 42 | +# 3) Run the mysqld_safe script with exec. |
| 43 | +--exec sh $MYSQLD_SAFE --defaults-file=$MYSQLTEST_VARDIR/my.cnf --log-error=$MYSQLTEST_VARDIR/log/err.log --basedir=$MYSQL_BASEDIR --ledir=$mysqld_path --datadir=$MYSQLD_DATADIR --socket=$MYSQL_SOCKET --pid-file=$MYSQL_PIDFILE --port=$MYSQL_PORT --timezone=SYSTEM --log-output=file --loose-debug-sync-timeout=600 --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB --loose-skip-log-bin --core-file --lc-messages-dir=$MYSQL_MESSAGESDIR --innodb-page-size=$other_page_size_nk < /dev/null > /dev/null 2>&1 & |
46 | 44 |
|
47 | 45 | # mysqld_safe takes some time to start mysqld |
48 | 46 | --enable_reconnect |
49 | 47 | --source include/wait_until_connected_again.inc |
50 | 48 | --disable_reconnect |
51 | 49 |
|
52 | | -# 5) Reconnect to mysqld again |
| 50 | +# 4) Reconnect to mysqld again |
53 | 51 | connection default; |
54 | 52 |
|
55 | | -# 6) Execute some SQL |
| 53 | +# 5) Execute some SQL |
56 | 54 | --exec $MYSQL -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root -e "SHOW DATABASES" 2>&1 |
57 | 55 |
|
58 | | -# 7) Kill mysqld, which must be restarted now automaticly by mysqld_safe |
| 56 | +# 6) Kill mysqld, which must be restarted now automaticly by mysqld_safe |
59 | 57 | --exec sh $MYSQL_TEST_DIR/t/mysqld_safe.sh $MYSQL_PIDFILE 2>&1 |
60 | 58 |
|
61 | 59 | # mysqld_safe takes some time to restart mysqld |
62 | 60 | --enable_reconnect |
63 | 61 | --source include/wait_until_connected_again.inc |
64 | 62 | --disable_reconnect |
65 | 63 |
|
66 | | -# 8) Execute some SQL |
| 64 | +# 7) Execute some SQL |
67 | 65 | --exec $MYSQL -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root -e "SHOW DATABASES" 2>&1 |
68 | 66 |
|
69 | | -# 9) Shutdown mysqld with mysqladmin |
| 67 | +# 8) Shutdown mysqld with mysqladmin |
70 | 68 | --exec $MYSQLADMIN -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1 |
71 | 69 |
|
72 | 70 | # Delay introduced - mysqld_safe takes some time to restart mysqld |
73 | 71 | --source include/wait_until_disconnected.inc |
74 | 72 |
|
75 | | -# 10) Restart mysqld of mtr |
| 73 | +# 9) Restart mysqld of mtr |
76 | 74 | --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect |
77 | 75 | --enable_reconnect |
78 | 76 | --source include/wait_until_connected_again.inc |
0 commit comments