diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-05 00:12:45 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-05 00:12:45 +0300 |
| commit | b5a181e2ff2304cc934608027153dd3aecd92f23 (patch) | |
| tree | 824e127f68404d3fbe881d6619e34ad389d21202 /scripts/Makefile.am | |
| parent | 84e849b588a0a5de48703b2b7f412121eb4db60b (diff) | |
| parent | 9eb7ee181f596fe9f367b48609722f7ce2141f98 (diff) | |
| download | mariadb-git-b5a181e2ff2304cc934608027153dd3aecd92f23.tar.gz | |
merge with public tree
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_version.h.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysys/default.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 1134226bfaf..29cfad11220 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -63,6 +63,8 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ mysqlaccess.conf \ mysqlbug +pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql + # mysqlbug should be distributed built so that people can report build # failures with it. CLEANFILES = @server_scripts@ \ |