summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-05 16:51:31 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-05 16:51:31 +0200
commit9fad4fded7059771a733ff697d163055a9a00614 (patch)
treeaa9350452d261bd213b4a75a1a2c1b24835920c6 /mysql-test/include
parent28ed7dd90bdbc95763836fe2d5ea0fc13e3ed8b2 (diff)
parente10b50e6f13206ec8fc320518d4460ca39a12ed2 (diff)
downloadmariadb-git-9fad4fded7059771a733ff697d163055a9a00614.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959 client/mysqltest.c: Auto merged mysql-test/t/mysqltest.test: Auto merged
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/mysqltest-x.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/mysqltest-x.inc b/mysql-test/include/mysqltest-x.inc
new file mode 100644
index 00000000000..dd1468aed07
--- /dev/null
+++ b/mysql-test/include/mysqltest-x.inc
@@ -0,0 +1,2 @@
+echo Output from mysqltest-x.inc;
+