diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-16 20:47:46 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-16 20:47:46 +0200 |
| commit | 90b2534f8f8fda105fdda2731273ba839b328da3 (patch) | |
| tree | e1fdb60db4adfe4fafddb5d063b62fbb7cff6326 /Makefile.am | |
| parent | ef3091541e34703138e1c9f2fa5037faefaf20ba (diff) | |
| parent | 3d00544c0f101cdadb52126245c534a62578ad91 (diff) | |
| download | mariadb-git-90b2534f8f8fda105fdda2731273ba839b328da3.tar.gz | |
Merge with 3.23
innobase/btr/btr0btr.c:
Auto merged
ltconfig:
Auto merged
innobase/include/btr0btr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
libmysql/Makefile.shared:
Auto merged
man/isamlog.1:
Auto merged
man/mysql.1:
Auto merged
man/mysql_zap.1:
Auto merged
man/isamchk.1:
Auto merged
man/mysqlaccess.1:
Auto merged
man/mysqladmin.1:
Auto merged
man/mysqld_multi.1:
Auto merged
man/mysqld.1:
Auto merged
man/mysqld_safe.1:
Auto merged
man/mysqldump.1:
Auto merged
man/mysqlshow.1:
Auto merged
man/replace.1:
Auto merged
myisam/mi_unique.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/sql_table.cc:
Auto merged
strings/Makefile.am:
Auto merged
man/perror.1:
Auto merged
Makefile.am:
merge with 3.23
client/mysqltest.c:
merge with 3.23
innobase/btr/btr0pcur.c:
merge with 3.23 (use local file)
innobase/row/row0purge.c:
merge with 3.23 (use local file)
scripts/mysql_fix_privilege_tables.sh:
Merge with 3.23 (Apply debian patches)
sql/ha_innodb.cc:
merge with 3.23 (use local file)
sql/mysqld.cc:
Merge with 3.23 (use local file)
sql/net_serv.cc:
Merge with 3.23 (use local file)
sql/sql_db.cc:
Merge with 3.23 (use local file)
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 87d1c7b5b71..7949e7be776 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,10 +21,10 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB -SUBDIRS = include @docs_dirs@ @readline_dir@ \ +SUBDIRS = . include @docs_dirs@ @readline_dir@ \ @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ @libmysqld_dirs@ scripts man \ - tests BUILD os2 \ + @sql_server_dirs@ scripts man tests \ + BUILD os2 libmysql_r @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ # Relink after clean |