mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
@ -28,7 +28,8 @@ rm -f */*.linux
|
|||||||
./configure --without-innodb --without-docs
|
./configure --without-innodb --without-docs
|
||||||
|
|
||||||
# build tools only
|
# build tools only
|
||||||
make clean all-local
|
make clean
|
||||||
|
make
|
||||||
|
|
||||||
# Create mysql_version.h which was deleted my previous step
|
# Create mysql_version.h which was deleted my previous step
|
||||||
./config.status include/mysql_version.h
|
./config.status include/mysql_version.h
|
||||||
@ -55,7 +56,7 @@ make clean all-local
|
|||||||
# copying required linux tools
|
# copying required linux tools
|
||||||
cp extra/comp_err extra/comp_err.linux
|
cp extra/comp_err extra/comp_err.linux
|
||||||
cp libmysql/conf_to_src libmysql/conf_to_src.linux
|
cp libmysql/conf_to_src libmysql/conf_to_src.linux
|
||||||
cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
|
#cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
|
||||||
cp sql/gen_lex_hash sql/gen_lex_hash.linux
|
cp sql/gen_lex_hash sql/gen_lex_hash.linux
|
||||||
cp strings/conf_to_src strings/conf_to_src.linux
|
cp strings/conf_to_src strings/conf_to_src.linux
|
||||||
|
|
||||||
|
@ -7,5 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
|
|||||||
DESCRIPTION "MySQL Client Library"
|
DESCRIPTION "MySQL Client Library"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
AUTOUNLOAD
|
AUTOUNLOAD
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Print Defaults Tool"
|
DESCRIPTION "MySQL Print Defaults Tool"
|
||||||
VERSION 5, 0, 8
|
VERSION 5, 0, 17
|
||||||
STACKSIZE 32767
|
STACKSIZE 32767
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL MyISAM Table Log Tool"
|
DESCRIPTION "MySQL MyISAM Table Log Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL MyISAM Table Pack Tool"
|
DESCRIPTION "MySQL MyISAM Table Pack Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL Install"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Initial Database Installer"
|
DESCRIPTION "MySQL Initial Database Installer"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Admin Tool"
|
DESCRIPTION "MySQL Admin Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
STACKSIZE 32767
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Binary Log Dump Tool"
|
DESCRIPTION "MySQL Binary Log Dump Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL Check Tool[scrollable]"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Check Tool"
|
DESCRIPTION "MySQL Check Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL Database Server"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Database Server Monitor"
|
DESCRIPTION "MySQL Database Server Monitor"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
MULTIPLE
|
MULTIPLE
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL Dump Tool[scrollable]"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Dump Tool"
|
DESCRIPTION "MySQL Dump Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ SCREENNAME "MySQL Import[scrollable]"
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Import Tool"
|
DESCRIPTION "MySQL Import Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@ MODULE libc.nlm
|
|||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL Error Code Description Tool"
|
DESCRIPTION "MySQL Error Code Description Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
|
STACKSIZE 32768
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
|
||||||
|
@ -193,6 +193,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
|
|||||||
libname=`basename $i .a`
|
libname=`basename $i .a`
|
||||||
$MV $i $BASE/lib/$libname.lib
|
$MV $i $BASE/lib/$libname.lib
|
||||||
done
|
done
|
||||||
|
rm -f $BASE/lib/*.la
|
||||||
fi
|
fi
|
||||||
|
|
||||||
copyfileto $BASE/include config.h include/*
|
copyfileto $BASE/include config.h include/*
|
||||||
@ -288,6 +289,9 @@ if [ $BASE_SYSTEM = "netware" ] ; then
|
|||||||
$BASE/support-files/mysql*.spec \
|
$BASE/support-files/mysql*.spec \
|
||||||
$BASE/support-files/mysql-log-rotate \
|
$BASE/support-files/mysql-log-rotate \
|
||||||
$BASE/support-files/binary-configure \
|
$BASE/support-files/binary-configure \
|
||||||
|
$BASE/support-files/build-tags \
|
||||||
|
$BASE/support-files/MySQL-shared-compat.spec \
|
||||||
|
$BASE/support-files/ndb-config-2-node.ini \
|
||||||
$BASE/INSTALL-BINARY \
|
$BASE/INSTALL-BINARY \
|
||||||
$BASE/MySQLEULA.txt
|
$BASE/MySQLEULA.txt
|
||||||
else
|
else
|
||||||
|
@ -2443,6 +2443,7 @@ scan_tz_dir(char * name_end)
|
|||||||
int
|
int
|
||||||
main(int argc, char **argv)
|
main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
#ifndef __NETWARE__
|
||||||
MY_INIT(argv[0]);
|
MY_INIT(argv[0]);
|
||||||
|
|
||||||
if (argc != 2 && argc != 3)
|
if (argc != 2 && argc != 3)
|
||||||
@ -2501,6 +2502,10 @@ main(int argc, char **argv)
|
|||||||
free_root(&tz_storage, MYF(0));
|
free_root(&tz_storage, MYF(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "This tool has not been ported to NetWare\n");
|
||||||
|
#endif /* __NETWARE__ */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user