Merge lp:~ourdelta-core/ourdelta/ourdelta-mtrfix into lp:~ourdelta-core/ourdelta/trunk015fmt

[Kristian Nielsen]

[Kristian Nielsen (knielsen)]

Some test failures were caused by a missing file in package mariadb-test-5.1. Add this missing file.

[lp:~ourdelta-core/ourdelta/ourdelta-mtrfix]

66. By Kristian Nielsen on 2009-11-06

Add missing testsuite include file.

Unmerged revisions

66. By Kristian Nielsen on 2009-11-06

Add missing testsuite include file.

65. By Kristian Nielsen on 2009-11-06

Add missing testsuite include file.

=== modified file 'bakery/debian-5.1/mariadb-test-5.1.files'
--- bakery/debian-5.1/mariadb-test-5.1.files	2009-10-14 02:46:22 +0000
+++ bakery/debian-5.1/mariadb-test-5.1.files	2009-11-06 10:21:13 +0000
@@ -1308,6 +1308,7 @@
 usr/share/mysql/mysql-test/r/have_latin2_ch.require
 usr/share/mysql/mysql-test/r/ctype_utf8.result
 usr/share/mysql/mysql-test/r/endspace.result
+usr/share/mysql/mysql-test/r/have_working_dns.require
 usr/share/mysql/mysql-test/include/no_running_events.inc
 usr/share/mysql/mysql-test/include/have_pbxt.inc
 usr/share/mysql/mysql-test/include/show_binlog_using_logname.inc
@@ -1533,6 +1534,7 @@
 usr/share/mysql/mysql-test/include/delete_anonymous_users.inc
 usr/share/mysql/mysql-test/include/deadlock.inc
 usr/share/mysql/mysql-test/include/wait_for_slave_sql_to_stop.inc
+usr/share/mysql/mysql-test/include/have_working_dns.inc
 usr/share/mysql/mysql-test/suite/parts/inc/partition_text.inc
 usr/share/mysql/mysql-test/suite/parts/inc/partition_20.inc
 usr/share/mysql/mysql-test/suite/parts/inc/partition_trigg1.inc