summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-04-18 19:34:50 +0200
committermsvensson@pilot.blaudden <>2007-04-18 19:34:50 +0200
commit77dcfdd8e714e5d8e671c5a1a843cdb5ab73f386 (patch)
tree10f4791421cf9af3d8fd39785f67ba6d474da5f6 /scripts
parent91213f512c6eac81f88cea7a9a9f46980e7ba709 (diff)
parent50669c43ac4e085d5e1e6d78d7c1ef4eefd416da (diff)
downloadmariadb-git-77dcfdd8e714e5d8e671c5a1a843cdb5ab73f386.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 6338e9e1b67..ff3bfceb78d 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -57,7 +57,8 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \
mysqlaccess.conf \
mysqlbug \
make_win_bin_dist \
- mysql_system_tables_fix.sql
+ mysql_system_tables_fix.sql \
+ CMakeLists.txt
dist_pkgdata_DATA = fill_help_tables.sql \
mysql_fix_privilege_tables.sql \