diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-12-01 23:28:59 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-12-01 23:28:59 +0100 |
| commit | 9ef82386b450c97f78da89648c82fc2df83bae57 (patch) | |
| tree | f992d0d25981d808d051cf90f45e0640e96ee1cf /netware/Makefile.am | |
| parent | d7fc500627914637605fe74c3b8891cdbf32e5e0 (diff) | |
| parent | d2eabe30fffd797eb2aff7295ab2c3e5fcb8b277 (diff) | |
| download | mariadb-git-9ef82386b450c97f78da89648c82fc2df83bae57.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.1-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'netware/Makefile.am')
| -rw-r--r-- | netware/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index beb3fda35ee..9c7d9c9763b 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -30,7 +30,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ client/mysqlbinlog.def client/mysqlcheck.def \ client/mysqldump.def client/mysqlimport.def \ client/mysqlshow.def client/mysqltest.def \ - client/mysqlslap.def \ + client/mysqlslap.def client/mysql_upgrade.def \ sql/mysqld.def extra/mysql_waitpid.def \ extra/my_print_defaults.def \ extra/perror.def extra/replace.def \ @@ -73,7 +73,8 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ mysql_test_run.def mysql_waitpid.def mysqladmin.def \ mysqlbinlog.def mysqlcheck.def mysqld.def \ mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \ - mysqlshow.def mysqltest.def mysqlslap.def perror.def \ + mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \ + perror.def \ replace.def resolve_stack_dump.def resolveip.def test_db.sql \ static_init_db.sql \ BUILD/apply-patch BUILD/compile-AUTOTOOLS \ |