diff options
| author | unknown <serg@serg.mylan> | 2003-11-25 20:06:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-25 20:06:41 +0100 |
| commit | 8e9d7bc6bc35241e78faea574db372c4920f1027 (patch) | |
| tree | 8cc43c192dcee4e7b495d445175607e1cdda5c85 /Makefile.am | |
| parent | f2927d6202b8cd65b1b183c78a2ff207cf1ff725 (diff) | |
| download | mariadb-git-8e9d7bc6bc35241e78faea574db372c4920f1027.tar.gz | |
post-merge fixes
Makefile.am:
spurious space (from a bad merge) deleted
mysql-test/r/rpl_change_master.result:
test results updated
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 c330471169d..6afbce11dfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib -SUBDIRS = . include @docs_dirs@ \ +SUBDIRS = . include @docs_dirs@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack @sql_client_dirs@ \ @sql_server_dirs@ scripts man tests \ |