Commit 33c8e43a authored by unknown's avatar unknown
Browse files

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/rem0cmp.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Merged from 5.0
storage/ndb/test/run-test/daily-basic-tests.txt:
  Merged from 5.0
parents 3cb80d32 bc72c684

netware/BUILD/compile-linux-tools

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ rm -f */*.linux 
./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 @@ make clean all-local 
# 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

netware/libmysql.def

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

XDCDATA ../netware/mysql.xdc

#DEBUG

netware/my_print_defaults.def

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

netware/myisamlog.def

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool" 
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

netware/myisampack.def

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool" 
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