diff options
| author | unknown <joerg@trift2.> | 2007-08-23 19:43:21 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-23 19:43:21 +0200 |
| commit | 82b2ad46ce39774f673ddd96797e51118962f0a8 (patch) | |
| tree | 6396eaf0ed4d8132950ec393714d3ea9410c580d /netware | |
| parent | caab3177ac407d8ca51751d5319a7a24d11e41eb (diff) | |
| parent | 189af51528f5834c6dda50442fc74f9d4745825c (diff) | |
| download | mariadb-git-82b2ad46ce39774f673ddd96797e51118962f0a8.tar.gz | |
Merge trift2.:/MySQL/M51/netware-5.1
into trift2.:/MySQL/M51/push-5.1
netware/Makefile.am:
Auto merged
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/Makefile.am | 2 | ||||
| -rw-r--r-- | netware/isamchk.def | 12 | ||||
| -rw-r--r-- | netware/isamlog.def | 11 | ||||
| -rw-r--r-- | netware/pack_isam.def | 13 |
4 files changed, 1 insertions, 37 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index b3a1b9377f7..57e8f563d8a 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -46,7 +46,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ link_sources: for f in $(netware_build_files); do \ rm -f ../$$f; \ - org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \ + org=`basename $$f`; \ @LN_CP_F@ $(srcdir)/$$org ../$$f; \ done echo timestamp > link_sources diff --git a/netware/isamchk.def b/netware/isamchk.def deleted file mode 100644 index 8ae2c0ca96c..00000000000 --- a/netware/isamchk.def +++ /dev/null @@ -1,12 +0,0 @@ -#------------------------------------------------------------------------------ -# ISAM Check -#------------------------------------------------------------------------------ -MODULE libc.nlm -SCREENNAME "MySQL ISAM Table Check Tool" -COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." -DESCRIPTION "MySQL ISAM Table Check Tool" -VERSION 4, 0 -STACKSIZE 131072 -XDCDATA ../netware/mysql.xdc -#DEBUG - diff --git a/netware/isamlog.def b/netware/isamlog.def deleted file mode 100644 index 777d73a7835..00000000000 --- a/netware/isamlog.def +++ /dev/null @@ -1,11 +0,0 @@ -#------------------------------------------------------------------------------ -# ISAM Log -#------------------------------------------------------------------------------ -MODULE libc.nlm -COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." -DESCRIPTION "MySQL ISAM Table Log Tool" -VERSION 4, 0 -STACKSIZE 131072 -XDCDATA ../netware/mysql.xdc -#DEBUG - diff --git a/netware/pack_isam.def b/netware/pack_isam.def deleted file mode 100644 index 514b57b04bd..00000000000 --- a/netware/pack_isam.def +++ /dev/null @@ -1,13 +0,0 @@ -#------------------------------------------------------------------------------ -# Pack ISAM -#------------------------------------------------------------------------------ -MODULE libc.nlm -SCREENNAME "MySQL ISAM Table Pack Tool" -COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." -DESCRIPTION "MySQL ISAM Table Pack Tool" -SCREENNAME "MySQL ISAM Table Pack Tool" -VERSION 4, 0 -STACKSIZE 131072 -XDCDATA ../netware/mysql.xdc -#DEBUG - |