diff options
| author | unknown <kent@mysql.com> | 2006-06-17 02:05:48 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-06-17 02:05:48 +0200 |
| commit | b1b5dbb0a6c65930592e04605688dab64cdcd81c (patch) | |
| tree | 915673e714fd156eb533cd69575a3c3bb4350930 /netware | |
| parent | 91fb831076504e4760eb9bdfb1683d5221e1aeae (diff) | |
| parent | e2d3943c6a33870b68f8f1b9384e2869baf99ec3 (diff) | |
| download | mariadb-git-b1b5dbb0a6c65930592e04605688dab64cdcd81c.tar.gz | |
Merge
BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
Auto merged
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/Makefile.am | 4 | ||||
| -rw-r--r-- | netware/mysql_install.def | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index ab88d97f9bc..2d34283c4b3 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -29,7 +29,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 \ - extra/mysql_install.def extra/my_print_defaults.def \ + extra/my_print_defaults.def \ extra/perror.def extra/replace.def \ extra/resolveip.def extra/comp_err.def \ libmysqld/libmysqld.def myisam/myisamchk.def \ @@ -50,7 +50,7 @@ EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \ libmysqlmain.c my_manage.c my_manage.h \ my_print_defaults.def myisam_ftdump.def myisamchk.def \ myisamlog.def myisampack.def mysql.def mysql.xdc \ - mysql_fix_privilege_tables.pl mysql_install.def \ + mysql_fix_privilege_tables.pl \ mysql_install_db.c mysql_install_db.def \ mysql_secure_installation.pl mysql_test_run.c \ mysql_test_run.def mysql_waitpid.def mysqladmin.def \ diff --git a/netware/mysql_install.def b/netware/mysql_install.def deleted file mode 100644 index 3392afb7298..00000000000 --- a/netware/mysql_install.def +++ /dev/null @@ -1,10 +0,0 @@ -#------------------------------------------------------------------------------ -# My Print Defaults -#------------------------------------------------------------------------------ -MODULE libc.nlm -COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." -DESCRIPTION "MySQL Install Tool" -VERSION 4, 0 -XDCDATA ../netware/mysql.xdc -#DEBUG - |