diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 18:03:07 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 18:03:07 +0300 |
| commit | 1ea806b1748c4ffc0904021d7d1e938fe837d73e (patch) | |
| tree | 66e86ba43432e208ac5184873ea51fbe95cc8c60 /storage/maria/unittest | |
| parent | 6ed46be70e0c1886231729458b94fb3321ac1a31 (diff) | |
| parent | 23d10db8a3fd1830afbca1e0ab374799cc715aaa (diff) | |
| download | mariadb-git-1ea806b1748c4ffc0904021d7d1e938fe837d73e.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into labbari.dsl.inet.fi:/home/my/bk/mysql-maria.prod
mysys/thr_lock.c:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/trnman.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
sql/lock.cc:
SCCS merged
Diffstat (limited to 'storage/maria/unittest')
| -rw-r--r-- | storage/maria/unittest/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/unittest/Makefile.am b/storage/maria/unittest/Makefile.am index 28264d5d903..b63cb60c059 100644 --- a/storage/maria/unittest/Makefile.am +++ b/storage/maria/unittest/Makefile.am @@ -84,6 +84,6 @@ ma_pagecache_consist_64kWR_t_big_CPPFLAGS = $(ma_pagecache_common_cppflags) -DPA # the generic lock manager may not be used in the end and lockman1-t crashes, # so we don't build lockman-t and lockman1-t -CLEANFILES = maria_control page_cache_test_file_1 \ +CLEANFILES = maria_log_control page_cache_test_file_1 \ maria_log.???????? |