diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-19 11:15:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-19 11:15:59 +0100 |
| commit | be1fb16006b11a360b8439877c34ea6e49007ecf (patch) | |
| tree | 03513f9684a07a5f525ab42fea770ce28016381e /tests/Makefile.am | |
| parent | 56ce4907f1112934a34be6c0a4dc03a00ae32436 (diff) | |
| parent | 0eec6c133a164eb2b0c19f0241054edb4a52825f (diff) | |
| download | mariadb-git-be1fb16006b11a360b8439877c34ea6e49007ecf.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/Makefile.am:
Auto merged
mysql-test/install_test_db.sh:
Manual merge
sql/sql_acl.h:
Manual merge
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 07a3a3b913c..5f34def19bd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \ insert_and_repair.pl \ grant.pl grant.res test_delayed_insert.pl \ pmail.pl mail_to_db.pl table_types.pl \ - udf_test udf_test.res myisam-big-rows.tst \ + myisam-big-rows.tst \ CMakeLists.txt bin_PROGRAMS = mysql_client_test |