diff options
| author | unknown <jimw@mysql.com> | 2006-04-13 10:37:57 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-13 10:37:57 -0700 |
| commit | c323e60c46c73efde0efea3ff056f83e17cb9009 (patch) | |
| tree | 6e8a46e592c3904f889bb457121f5350fbcf5661 /Makefile.am | |
| parent | e2f724a8222e881737d73fb4b6f549ab6c56f247 (diff) | |
| parent | 0544ed4204416540bc11b222d4dd1af24a4a744d (diff) | |
| download | mariadb-git-c323e60c46c73efde0efea3ff056f83e17cb9009.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-clean
into mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
Makefile.am:
Resolve conflict
configure.in:
Resolve conflict
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 923fe946702..dbf43151d60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @sql_server@ scripts @man_dirs@ tests \ @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @tools_dirs@ \ + mysql-test support-files @tools_dirs@ \ plugin unittest win DIST_SUBDIRS = $(SUBDIRS) BUILD |