Commit 9ef82386 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/mysql-5.0-build 

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
parents d7fc5006 d2eabe30

netware/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,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 \

                                client/mysqlslap.def \

                                client/mysqlslap.def client/mysql_upgrade.def \

                                sql/mysqld.def extra/mysql_waitpid.def \

                                extra/my_print_defaults.def \

                                extra/perror.def extra/replace.def \
@@ -73,7 +73,8 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ 
		mysql_test_run.def mysql_waitpid.def mysqladmin.def \

		mysqlbinlog.def mysqlcheck.def mysqld.def \

		mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \

		mysqlshow.def mysqltest.def mysqlslap.def perror.def \

		mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \

		perror.def \

		replace.def resolve_stack_dump.def resolveip.def test_db.sql \

		static_init_db.sql \

		BUILD/apply-patch BUILD/compile-AUTOTOOLS \

netware/comp_err.def

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ MODULE libc.nlm 
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."

DESCRIPTION "MySQL Error File Compiler"

VERSION 4, 0

STACKSIZE 131072

XDCDATA ../netware/mysql.xdc

#DEBUG

netware/isamchk.def

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 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 65536

STACKSIZE 131072

XDCDATA ../netware/mysql.xdc

#DEBUG

netware/isamlog.def

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 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

netware/libmysql.def

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res 
DESCRIPTION "MySQL Client Library"

VERSION 4, 0

AUTOUNLOAD

STACKSIZE 32768

STACKSIZE 131072

XDCDATA ../netware/mysql.xdc

#DEBUG