From: jani Date: December 13 2005 4:44pm Subject: bk commit into 5.0 tree (jani:1.1978) List-Archive: http://lists.mysql.com/commits/115 Message-Id: <20051213164429.20FB43998D5@rhols221.adsl.netsonic.fi> Below is the list of changes that have just been committed into a local 5.0 repository of jani. When jani does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1978 05/12/13 18:44:20 jani@stripped +16 -0 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 netware/mysqladmin.def 1.8 05/12/13 18:44:15 jani@stripped +0 -1 Merged from 4.1 netware/my_print_defaults.def 1.7 05/12/13 18:44:15 jani@stripped +1 -2 Merged from 4.1 netware/BUILD/compile-linux-tools 1.10 05/12/13 18:44:14 jani@stripped +0 -0 Merged from 4.1 sql/tztime.cc 1.29 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged scripts/make_binary_distribution.sh 1.103 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/perror.def 1.6 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysqlimport.def 1.8 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysqldump.def 1.8 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysqld_safe.def 1.5 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysqlcheck.def 1.8 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysqlbinlog.def 1.8 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysql_install_db.def 1.6 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/mysql.def 1.8 05/12/13 18:40:16 jani@stripped +0 -1 Auto merged netware/myisampack.def 1.7 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/myisamlog.def 1.7 05/12/13 18:40:16 jani@stripped +0 -0 Auto merged netware/libmysql.def 1.6 05/12/13 18:40:15 jani@stripped +0 -0 Auto merged # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jani # Host: a193-229-222-105.elisa-laajakaista.fi # Root: /home/my/bk/mysql-5.0/RESYNC --- 1.102/scripts/make_binary_distribution.sh 2005-12-05 19:13:01 +02:00 +++ 1.103/scripts/make_binary_distribution.sh 2005-12-13 18:40:16 +02:00 @@ -193,6 +193,7 @@ libname=`basename $i .a` $MV $i $BASE/lib/$libname.lib done + rm -f $BASE/lib/*.la fi copyfileto $BASE/include config.h include/* @@ -288,6 +289,9 @@ $BASE/support-files/mysql*.spec \ $BASE/support-files/mysql-log-rotate \ $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/MySQLEULA.txt else --- 1.28/sql/tztime.cc 2005-11-23 20:18:04 +02:00 +++ 1.29/sql/tztime.cc 2005-12-13 18:40:16 +02:00 @@ -2443,6 +2443,7 @@ int main(int argc, char **argv) { +#ifndef __NETWARE__ MY_INIT(argv[0]); if (argc != 2 && argc != 3) @@ -2500,6 +2501,10 @@ free_root(&tz_storage, MYF(0)); } + +#else + fprintf(stderr, "This tool has not been ported to NetWare\n"); +#endif /* __NETWARE__ */ return 0; } --- 1.9/netware/BUILD/compile-linux-tools 2005-10-28 11:48:09 +03:00 +++ 1.10/netware/BUILD/compile-linux-tools 2005-12-13 18:44:14 +02:00 @@ -28,7 +28,8 @@ ./configure --without-innodb --without-docs # build tools only -make clean all-local +make clean +make # Create mysql_version.h which was deleted my previous step ./config.status include/mysql_version.h @@ -55,7 +56,7 @@ # copying required linux tools cp extra/comp_err extra/comp_err.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 strings/conf_to_src strings/conf_to_src.linux --- 1.5/netware/libmysql.def 2004-11-30 19:58:13 +02:00 +++ 1.6/netware/libmysql.def 2005-12-13 18:40:15 +02:00 @@ -7,5 +7,6 @@ DESCRIPTION "MySQL Client Library" VERSION 4, 0 AUTOUNLOAD +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.6/netware/my_print_defaults.def 2005-06-29 14:02:05 +03:00 +++ 1.7/netware/my_print_defaults.def 2005-12-13 18:44:15 +02:00 @@ -4,7 +4,7 @@ MODULE libc.nlm COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Print Defaults Tool" -VERSION 5, 0, 8 +VERSION 5, 0, 17 STACKSIZE 32767 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.6/netware/myisamlog.def 2004-11-30 19:58:13 +02:00 +++ 1.7/netware/myisamlog.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL MyISAM Table Log Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.6/netware/myisampack.def 2004-11-30 19:58:13 +02:00 +++ 1.7/netware/myisampack.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL MyISAM Table Pack Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.5/netware/mysql_install_db.def 2004-11-30 19:58:13 +02:00 +++ 1.6/netware/mysql_install_db.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Initial Database Installer" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.7/netware/mysqladmin.def 2005-08-28 11:38:09 +03:00 +++ 1.8/netware/mysqladmin.def 2005-12-13 18:44:15 +02:00 @@ -6,7 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Admin Tool" VERSION 4, 0 -STACKSIZE 32767 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.7/netware/mysqlbinlog.def 2005-08-26 15:45:20 +03:00 +++ 1.8/netware/mysqlbinlog.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Binary Log Dump Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.7/netware/mysqlcheck.def 2005-08-26 15:45:20 +03:00 +++ 1.8/netware/mysqlcheck.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Check Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.4/netware/mysqld_safe.def 2004-11-30 19:58:13 +02:00 +++ 1.5/netware/mysqld_safe.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Database Server Monitor" VERSION 4, 0 +STACKSIZE 32768 MULTIPLE XDCDATA ../netware/mysql.xdc #DEBUG --- 1.7/netware/mysqldump.def 2005-08-26 15:45:20 +03:00 +++ 1.8/netware/mysqldump.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Dump Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.7/netware/mysqlimport.def 2005-08-26 15:45:20 +03:00 +++ 1.8/netware/mysqlimport.def 2005-12-13 18:40:16 +02:00 @@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Import Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG --- 1.5/netware/perror.def 2004-11-30 19:58:13 +02:00 +++ 1.6/netware/perror.def 2005-12-13 18:40:16 +02:00 @@ -5,6 +5,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Error Code Description Tool" VERSION 4, 0 +STACKSIZE 32768 XDCDATA ../netware/mysql.xdc #DEBUG