diff options
| author | unknown <acurtis@xiphis.org> | 2006-04-24 13:36:15 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-04-24 13:36:15 -0700 |
| commit | 1260bc887358d3fc4c060b21eb1c755c3f5dee69 (patch) | |
| tree | 8d426c8740820381d4c07c02035f4a4bf29c2fa3 /Makefile.am | |
| parent | 3f63edb362e89df761e575842ac39ef4c86a664c (diff) | |
| parent | 5521b1bb9e5c7fb086feb9c731873b5874ccce0a (diff) | |
| download | mariadb-git-1260bc887358d3fc4c060b21eb1c755c3f5dee69.tar.gz | |
Merge xiphis.org:/home/antony/work2/wl3201.3
into xiphis.org:/home/antony/work2/wl3201.merge
BUILD/SETUP.sh:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
Makefile.am:
Merge for WL#3201, some post-merge fixes will be required.
configure.in:
Merge for WL#3201
plugin/Makefile.am:
Merge for WL#3201
storage/innobase/Makefile.am:
Merge for WL#3201
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index dbf43151d60..b9775577110 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,6 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @thread_dirs@ pstack \ @sql_union_dirs@ storage \ @sql_server@ scripts @man_dirs@ tests \ - @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ mysql-test support-files @tools_dirs@ \ plugin unittest win |