into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-1717

sql-common/my_time.c:
  superfluous ; which caused a problem with gcc 2.95

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

mysql-test/r/auto_increment.result:
  bug test
mysql-test/t/auto_increment.test:
  bug test
sql/sql_base.cc:
  cleanup

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492

into mysql.com:/home/mysql_src/mysql-4.1-1717

if slave resumes at BEGIN).


mysql-test/t/rpl_relayrotate.test:
  require InnoDB (does not make sense without InnoDB)

into hegel.txg:/home/miguel/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqlbinlog.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).


client/client_priv.h:
  new options for mysqlbinlog
client/mysqlbinlog.cc:
  WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position.
  (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
   cannot accept 2 binlogs".
include/my_time.h:
  importing time functions so that client/ files can use them.
include/mysql_time.h:
  importing time types so that client/ files can use them.
sql-common/my_time.c:
  importing time functions so that client/ files can use them.
sql/mysql_priv.h:
  moving time functions out of sql/ into sql-common/
sql/time.cc:
  moving time functions out of sql/ into sql-common/
sql/tztime.h:
  moving time functions out of sql/ into sql-common/

(since it's in the other -max builds already).


BUILD/compile-pentium-max:
  Removed obviously obsolete comment.
BUILD/compile-pentium-valgrind-max:
  Added same --with* options as for other -max builds (e.g. ndbcluster).

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

  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

its own enter string.

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

TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with 
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1 
upgrade (which is more important since 4.1 is still beta).


mysql-test/r/metadata.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_2myisam.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_3innodb.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_4heap.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_5merge.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
sql/field.cc:
  TIMESTAMP should be UNSIGNED to preserve compatiblity with 4.0.
  (Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

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