summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.bunch@oracle.com>2010-08-03 16:11:23 +0200
committerBjorn Munch <bjorn.bunch@oracle.com>2010-08-03 16:11:23 +0200
commit5e92df6e0ee01cdea7865d3f0b6d02f840bf0402 (patch)
treeb38f90257b306555af6e691d0592cf4474bcc9f9 /mysql-test/include
parentf3d4e72cf1e98499ba189aa95747e999079d94e8 (diff)
downloadmariadb-git-5e92df6e0ee01cdea7865d3f0b6d02f840bf0402.tar.gz
Bug #55582 mtr root detection (and if-expression execution) broken
if() treated any non-numeric string as false Fixed to treat those as true instead Added some test cases Fixed missing $ in variable name in include/mix2.inc
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/mix2.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/mix2.inc b/mysql-test/include/mix2.inc
index b4c4a9b8836..123d049855a 100644
--- a/mysql-test/include/mix2.inc
+++ b/mysql-test/include/mix2.inc
@@ -1910,7 +1910,7 @@ select hex(s1) from t4;
drop table t1,t2,t3,t4;
}
-if (test_foreign_keys)
+if ($test_foreign_keys)
{
eval create table t1 (a int primary key,s1 varbinary(3) not null unique) engine=$engine_type;
eval create table t2 (s1 binary(2) not null, constraint c foreign key(s1) references t1(s1) on update cascade) engine=$engine_type;
@@ -2405,7 +2405,7 @@ drop table t1, t2, t3, t5, t6, t8, t9;
}
# End transactional tests
-if (test_foreign_keys)
+if ($test_foreign_keys)
{
# bug 18934, "InnoDB crashes when table uses column names like DB_ROW_ID"
--error 1005