Skip to content

Commit 3c42b8b

Browse files
committed
bash_lib: do not change set +-e during check_mariadb_server_and_{create,verify}_structures
These are handled by rpm/deb-install/upgrade.
1 parent 9214b9f commit 3c42b8b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

scripts/bash_lib.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@ save_failure_logs() {
468468

469469
check_mariadb_server_and_create_structures() {
470470
# All the commands below should succeed
471-
set -e
472471
sudo mariadb -e "CREATE DATABASE db"
473472
sudo mariadb -e "CREATE TABLE db.t_innodb(a1 SERIAL, c1 CHAR(8)) ENGINE=InnoDB; INSERT INTO db.t_innodb VALUES (1,'foo'),(2,'bar')"
474473
sudo mariadb -e "CREATE TABLE db.t_myisam(a2 SERIAL, c2 CHAR(8)) ENGINE=MyISAM; INSERT INTO db.t_myisam VALUES (1,'foo'),(2,'bar')"
@@ -481,14 +480,12 @@ check_mariadb_server_and_create_structures() {
481480
if [[ $test_mode == "columnstore" ]]; then
482481
sudo mariadb -e "CREATE TABLE db.t_columnstore(a INT, c VARCHAR(8)) ENGINE=ColumnStore; SHOW CREATE TABLE db.t_columnstore; INSERT INTO db.t_columnstore VALUES (1,'foo'),(2,'bar')"
483482
fi
484-
set +e
485483
}
486484

487485
check_mariadb_server_and_verify_structures() {
488486
# Print "have_xx" capabilitites for the new server
489487
sudo mariadb -e "select 'Stat' t, variable_name name, variable_value val from information_schema.global_status where variable_name like '%have%' union select 'Vars' t, variable_name name, variable_value val from information_schema.global_variables where variable_name like '%have%' order by t, name"
490488
# All the commands below should succeed
491-
set -e
492489
sudo mariadb -e "select @@version, @@version_comment"
493490
sudo mariadb -e "SHOW TABLES IN db"
494491
sudo mariadb -e "SELECT * FROM db.t_innodb; INSERT INTO db.t_innodb VALUES (3,'foo'),(4,'bar')"
@@ -505,7 +502,6 @@ check_mariadb_server_and_verify_structures() {
505502
if [[ $test_mode == "columnstore" ]]; then
506503
sudo mariadb -e "SELECT * FROM db.t_columnstore; INSERT INTO db.t_columnstore VALUES (3,'foo'),(4,'bar')"
507504
fi
508-
set +e
509505
}
510506

511507
control_mariadb_server() {

0 commit comments

Comments
 (0)