Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_pthread.h:
  Auto merged
myisam/mi_search.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
netware/pack_isam.def:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/xml.c:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
mysql-test/r/select.result:
  Merged from 4.1.
netware/BUILD/mwenv:
  Merged from 4.1.
scripts/make_binary_distribution.sh:
  Merged from 4.1.
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_show.cc:
  Merged from 4.1.
strings/my_strtoll10.c:
  Merged from 4.1.

1 files changed, 2 insertions, 2 deletions

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index 7f89a8faf7f..fa52568fcd6 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -19,9 +19,9 @@ export AR='mwldnlm'
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
+export CFLAGS='-enum int -align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
+export CXXFLAGS='-enum int -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
 export LD='mwldnlm'
 export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
 export RANLIB=: