into mysql.com:/home/mydev/mysql-5.0-5000


BUILD/SETUP.sh:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".

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

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261

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

  CAST now always return a well-formed character string.


sql/item_timefunc.cc:
  CAST now always return a well-formed character string.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged

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

into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0

into mysql.com:/home/mydev/mysql-5.0-5000


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/univ.i:
  Auto merged

Added a call to close the meta file after a repair.

into mysql.com:/my/mysql-5.0

into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged

into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged

sql/ha_federated.cc:
  changes to get rid of compile warnings
sql/ha_federated.h:
  changes to get rid of compile warnings

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/5.0

Archive fix by Ingo.
Innodb compile fix by Monty.


configure.in:
  Auto merged
innobase/include/univ.i:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  Merged Montys fix.

to avoid linking problems referring to the variable from .c programs.

into mysql.com:/home/matthias/Arbeit/mysql-5.0/src

into mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.



mysql-test/t/archive.test:
  Test Bug: Memory leaks in the archive handler.
  Fixed a typo.
sql/examples/ha_archive.h:
  Test Bug: Memory leaks in the archive handler.
  Added declarations for the new init/cleanup functions.
sql/handler.cc:
  Test Bug: Memory leaks in the archive handler.
  Added calls of the new init/cleanup functions.

(After review of cs georg:1.1800 by Monty)


VC++Files/libmysqld/libmysqld.dsp:
  removed ha_isammrg.cpp (doesn't exist anymore)
VC++Files/mysqldemb/mysqldemb.dsp:
  removed ha_isammrg.cpp (doesn't exist anymore)
extra/comp_err.c:
  renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal
  enumeration type)
innobase/ut/ut0ut.c:
  gettimeofday is not available under Windows. Added conditional define
  which uses GetLocalTime for windows
libmysql/libmysql.c:
  fixed prototype for setup_one_fetch_function which differed from
  function declaration.
  Fixed not supported unsigned __int64 to double conversion
sql/field.h:
  fixed typecast error (windows)
sql/item_sum.cc:
  fixed typecast errors (windows)
sql/key.cc:
  fixed typecast errors (windows)
sql/opt_range.cc:
  fixed not supported unsigned __int64 to double conversion
sql/sql_acl.cc:
  fixed typecast errors (windows)
sql/table.cc:
  fixed typecast errors (windows)

configure.in:
  Auto merged
innobase/include/univ.i:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
innobase/fil/fil0fil.c:
  Merge with 4.1

into mysql.com:/home/matthias/Arbeit/mysql-5.0/src

configure.in:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

BUILD/SETUP.sh:
  Abort if wrong options
BUILD/compile-pentium64-debug:
  Always use full debugging
innobase/fil/fil0fil.c:
  Fixed wrong printf() format

into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysqld.cc:
  Auto merged

into mysql.com:/home/matthias/Arbeit/mysql-5.0/src

into gw.mysql.r18.ru:/usr/home/ram/work/5.0

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

i.e. ndb_restore

into mysql.com:/my/mysql-4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged