diff options
| author | unknown <kent@mysql.com> | 2006-06-20 11:11:18 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-06-20 11:11:18 +0200 |
| commit | a25fc95dd9857faa538df1c18b0ce4ee48fdd5e0 (patch) | |
| tree | 95bc1ff8dea0c9c8225dd253d7fb40eabdf9d993 /netware | |
| parent | 008b1e5227d7c2186179013194cca3b4151ed113 (diff) | |
| parent | 81202460bed74286deb0c4d262cb4a171a8c41f5 (diff) | |
| download | mariadb-git-a25fc95dd9857faa538df1c18b0ce4ee48fdd5e0.tar.gz | |
Merge
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
storage/ndb/Makefile.am:
Auto merged
tests/mysql_client_test.c:
Auto merged
BUILD/compile-dist:
SCCS merged
netware/Makefile.am:
SCCS merged
netware/BUILD/compile-netware-END:
SCCS merged
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/compile-netware-END | 4 | ||||
| -rw-r--r-- | netware/Makefile.am | 4 | ||||
| -rw-r--r-- | netware/mysql_install.def | 10 |
3 files changed, 2 insertions, 16 deletions
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END index 0bb4e808b63..c5c08cea908 100755 --- a/netware/BUILD/compile-netware-END +++ b/netware/BUILD/compile-netware-END @@ -21,10 +21,6 @@ rm -rf Makefile.in.bk # run auto tools . $path/compile-AUTOTOOLS -# For NetWare there is no comp_err but comp_err.linux -sed -e "s/comp_err\$(EXEEXT)/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$ -mv extra/Makefile.am.$$ extra/Makefile.am - # configure ./configure $base_configs $extra_configs diff --git a/netware/Makefile.am b/netware/Makefile.am index e1c2eedc2b7..5b40933994b 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -31,7 +31,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ client/mysqlshow.def client/mysqltest.def \ client/mysqlslap.def \ sql/mysqld.def extra/mysql_waitpid.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 \ extra/resolve_stack_dump.def \ @@ -54,7 +54,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 - |