compile fix for gcc-2.95


sql/ha_ndbcluster.cc:
  compile fix for gcc-2.95
sql/ha_ndbcluster.h:
  compile fix for gcc-2.95

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-4100

used a common style with array subscripts,
improved the line-up, wrapped long lines.

into mysql.com:/home/kostja/mysql/mysql-4.1-root

  make subclass friend for gcc-2.95 et al [dup push]


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al

are such)

into mysql.com:/home/jonas/src/mysql-4.1

mysql-test/r/ndb_basic.result:
  Added order by to some selects
mysql-test/r/ndb_lock.result:
  Added order by to some selects
mysql-test/t/ndb_basic.test:
  Added order by to some selects
mysql-test/t/ndb_lock.test:
  Added order by to some selects

in the list.

  another spelling mistake fixed


acinclude.m4:
  another spelling mistake fixed

into mysql.com:/home/kostja/mysql/mysql-4.1-zlib


configure.in:
  Auto merged

- comment for AC_DEFINE(HAVE_COMPRESS) fixed
- build convenience library from zlib: we need to compile it into both
  libmysqlclient.a and libmysqlclient.so
- --with-zlib-dir=bundled configure option


acinclude.m4:
  - MYSQL_CHECK_ZLIB_WITH_COMPRESS: added support for 
  --with-zlib-dir=bundled
  - AC_DEFINE comment fixed
tools/Makefile.am:
  - uncomment bin_PROGRAMS (typo fixed)
zlib/Makefile.am:
  - build libtool convenience library, not static one: we need libz objects
    to be compiled in libmysqlclient.so shared version

into mysql.com:/usr/home/bar/mysql-4.1

ndb/test/ndbapi/Makefile.am:
  SCCS merged

ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Remove comma

mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged

into mysql.com:/orca/space/pekka/ndb/version/my41-blobs

  add NdbSqlUtil::cmp for missing datatypes


ndb/include/util/NdbSqlUtil.hpp:
  add NdbSqlUtil::cmp for missing datatypes
ndb/src/common/util/NdbSqlUtil.cpp:
  add NdbSqlUtil::cmp for missing datatypes

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb


ndb/test/ndbapi/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged

Make sure not to fiddle with state, if not waiting for scan


ndb/src/ndbapi/Ndbif.cpp:
  Make sure not to fiddle with state, if not waiting for scan

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1

required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb 
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts 
like AIX52 or HPUX11, where such a check is possible. It didn't compile 
there before as these systems dont't have installed zlib, so nothing got broken ;)


Makefile.am:
  WL#1518 "make bundled zlib usable for unix builds", part 2:
  - zlib dir should be built only if there is no system zlib available;
    with introducing of DIST_SUBDIRS goal, os2, BUILD and SSH now only entered
    if make dist
acinclude.m4:
  WL#1518, "make bundled zlib usable for unix builds":
  - actual implementation of the check for various zlib usage options
configure.in:
  WL#1518, "make bundled zlib usable for unix builds":
  - MYSQL_CHECK_ZLIB_WITH_COMPRESS deployed
libmysql/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
libmysql_r/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
libmysqld/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
myisam/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib binary dir added
mysys/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
sql/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir and library dir added
tools/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
  - copyright added

into mysql.com:/home/kostja/mysql/mysql-4.1-warnings

Use of acconfig.h is deprecated in modern autotools (a cleaner patch).


BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Delete: acconfig.h
acinclude.m4:
  All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
  Use of acconfig.h is deprecated in modern autotools.
configure.in:
  All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
  Use of acconfig.h is deprecated in modern autotools.

Fix for stored procedures BUG#4726: Stored procedure crash when looping over SELECT with complex WHERE's.


sql/sql_prepare.cc:
  Cleanup cond items too. (Fix for stored procedures.)

  mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
  Bug#4646


sql/sql_db.cc:
  mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
  Bug#4646

  merge


sql/ha_ndbcluster.cc:
  merge

sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge

  ndb_supported_type, include all types in switch


sql/ha_ndbcluster.cc:
  ndb_supported_type, include all types in switch