into mysql.com:/home/jonas/src/mysql-5.0-ndb


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged

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

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

into mysql.com:/my/mysql-5.0

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 poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

  updated doxygen Makefile for changed examples directory
.del-demos.tar~8e6dfbc510a6e323:
  Delete: ndb/ndbapi-examples/configurations/demos.tar
Many files:
  mvdir


ndb/ndbapi-examples/Makefile:
  mvdir
ndb/ndbapi-examples/mgmapi_logevent_example/Makefile:
  mvdir
ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example/readme.txt:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example1/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_event_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_retries_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_scan_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_scan_example/readme.txt:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp:
  mvdir
BitKeeper/deleted/.del-demos.tar~8e6dfbc510a6e323:
  Delete: ndb/ndbapi-examples/configurations/demos.tar
ndb/docs/Makefile.am:
  updated doxygen Makefile for changed examples directory

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


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

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


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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

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

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

(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)

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


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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

my_strnxfrm_utf8 now requires 2 bytes per character
in filesort key, instead of 3 bytes per character.
Shorter filesort keys make sorting faster.

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

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

mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge bug#8101 and setBound usage if id instead of name

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420

sql/sql_help.cc:
  a fix (bug #8129: help.test fails using --ps-protocol)
  In case of 'range' we have to call quick->reset().

into mysql.com:/my/mysql-4.1

This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files

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