mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
some more if stmt simplifications
This commit is contained in:
parent
bdedbcd87e
commit
c406c79797
5 changed files with 14 additions and 14 deletions
|
@ -9,7 +9,7 @@
|
|||
# --source extra/rpl_tests/rpl_stop_slave.test
|
||||
#
|
||||
|
||||
if (`SELECT "$tmp_table_stm" = ''`)
|
||||
if (!$tmp_table_stm)
|
||||
{
|
||||
--echo \$tmp_table_stm is NULL
|
||||
--die $tmp_table_stm is NULL
|
||||
|
|
|
@ -34,7 +34,7 @@ if (!$err)
|
|||
{
|
||||
--echo Success: Was able to run '$statement' under FTWRL.
|
||||
unlock tables;
|
||||
if (`SELECT "$cleanup_stmt" <> ""`)
|
||||
if ($cleanup_stmt)
|
||||
{
|
||||
--eval $cleanup_stmt;
|
||||
}
|
||||
|
@ -91,12 +91,12 @@ connection default;
|
|||
--reap
|
||||
}
|
||||
|
||||
if (`SELECT "$cleanup_stmt" <> ""`)
|
||||
if ($cleanup_stmt)
|
||||
{
|
||||
--eval $cleanup_stmt;
|
||||
}
|
||||
|
||||
if (`SELECT "$skip_3rd_check" = ""`)
|
||||
if (!$skip_3rd_check)
|
||||
{
|
||||
#
|
||||
# Finally, let us check that FTWRL will succeed if this statement
|
||||
|
@ -147,7 +147,7 @@ connection default;
|
|||
}
|
||||
|
||||
set debug_sync= "RESET";
|
||||
if (`SELECT "$cleanup_stmt" <> ""`)
|
||||
if ($cleanup_stmt)
|
||||
{
|
||||
--eval $cleanup_stmt;
|
||||
}
|
||||
|
|
|
@ -41,11 +41,11 @@ if (!$err)
|
|||
{
|
||||
--echo Error: Was able to run '$statement' under FTWRL!
|
||||
unlock tables;
|
||||
if (`SELECT "$cleanup_stmt1" <> ""`)
|
||||
if ($cleanup_stmt1)
|
||||
{
|
||||
--eval $cleanup_stmt1;
|
||||
}
|
||||
if (`SELECT "$cleanup_stmt2" <> ""`)
|
||||
if ($cleanup_stmt2)
|
||||
{
|
||||
--eval $cleanup_stmt2;
|
||||
}
|
||||
|
@ -88,16 +88,16 @@ unlock tables;
|
|||
connection default;
|
||||
--reap
|
||||
|
||||
if (`SELECT "$cleanup_stmt1" <> ""`)
|
||||
if ($cleanup_stmt1)
|
||||
{
|
||||
--eval $cleanup_stmt1;
|
||||
}
|
||||
if (`SELECT "$cleanup_stmt2" <> ""`)
|
||||
if ($cleanup_stmt2)
|
||||
{
|
||||
--eval $cleanup_stmt2;
|
||||
}
|
||||
|
||||
if (`SELECT "$skip_3rd_check" = ""`)
|
||||
if (!$skip_3rd_check)
|
||||
{
|
||||
#
|
||||
# Finally, let us check that FTWRL will not succeed if this
|
||||
|
@ -141,11 +141,11 @@ connection default;
|
|||
|
||||
set debug_sync= "RESET";
|
||||
|
||||
if (`SELECT "$cleanup_stmt1" <> ""`)
|
||||
if ($cleanup_stmt1)
|
||||
{
|
||||
--eval $cleanup_stmt1;
|
||||
}
|
||||
if (`SELECT "$cleanup_stmt2" <> ""`)
|
||||
if ($cleanup_stmt2)
|
||||
{
|
||||
--eval $cleanup_stmt2;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ if (`SELECT "XX$status_items" = "XX"`)
|
|||
--disable_query_log
|
||||
--vertical_results
|
||||
|
||||
while (`SELECT "XX$_items" <> "XX"`)
|
||||
while ($_items)
|
||||
{
|
||||
--let $_name= `SELECT SUBSTRING_INDEX('$_items', ',', 1)`
|
||||
--let $_items= `SELECT LTRIM(SUBSTRING('$_items', LENGTH('$_name') + 2))`
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
--source include/have_innodb.inc
|
||||
|
||||
let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1);
|
||||
if (`SELECT $innodb_lock_wait_timeout < 10`)
|
||||
if ($innodb_lock_wait_timeout < 10)
|
||||
{
|
||||
--echo # innodb_lock_wait_timeout must be >= 10 seconds
|
||||
--echo # so that this test can work all time fine on an overloaded testing box
|
||||
|
|
Loading…
Reference in a new issue