summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-04-13 12:39:34 +0300
committermonty@donna.mysql.fi <>2001-04-13 12:39:34 +0300
commit46839ed2f225193b0aaa6386312fca90b1453bb5 (patch)
treefa1346a4b858344c1283c7f751d9a97ae77bd9f7 /mysql-test/r
parent69be96cf2af8eb52a43d3bfbd9b644818e76e119 (diff)
parent8700c02daee78ef2550436e03f566f2fede1e781 (diff)
downloadmariadb-git-46839ed2f225193b0aaa6386312fca90b1453bb5.tar.gz
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/have_innodb.require (renamed from mysql-test/r/have_innobase.require)2
-rw-r--r--mysql-test/r/innodb.result (renamed from mysql-test/r/innobase.result)0
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/have_innobase.require b/mysql-test/r/have_innodb.require
index eefc7650e9f..48a764a6c58 100644
--- a/mysql-test/r/have_innobase.require
+++ b/mysql-test/r/have_innodb.require
@@ -1,2 +1,2 @@
Variable_name Value
-have_innobase YES
+have_innodb YES
diff --git a/mysql-test/r/innobase.result b/mysql-test/r/innodb.result
index 12f193bbdd9..12f193bbdd9 100644
--- a/mysql-test/r/innobase.result
+++ b/mysql-test/r/innodb.result