summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <ingo@chilla.local>2006-06-09 18:20:10 +0200
committerunknown <ingo@chilla.local>2006-06-09 18:20:10 +0200
commit761c75f36f91e11a10a875066fe08835723aa095 (patch)
tree81632ff8049a49489de01b39b1c9ecde42b04ed2 /mysql-test
parent0e0755eabf605eb4ceb7e79ccc0cd72a7f664d79 (diff)
parent0ad73944194f0f49ad0064f0d697f85bc9c7f063 (diff)
downloadmariadb-git-761c75f36f91e11a10a875066fe08835723aa095.tar.gz
Merge mysql.com:/home/mydev/mysql-5.1--main
into mysql.com:/home/mydev/mysql-5.1-amerge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/extra/binlog_tests/innodb_stat.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/extra/binlog_tests/innodb_stat.test b/mysql-test/extra/binlog_tests/innodb_stat.test
index 131c244d8fd..4638dfcd2f7 100644
--- a/mysql-test/extra/binlog_tests/innodb_stat.test
+++ b/mysql-test/extra/binlog_tests/innodb_stat.test
@@ -1,3 +1,5 @@
+# Embedded server doesn't support binlog
+-- source include/not_embedded.inc
-- source include/have_innodb.inc
#