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

(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/matthias/Arbeit/mysql-5.0/src

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

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

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

Bug#8101  unique indexes which attribute are _not_ specified in the order of the table does not work

  
  Test cases using common object (database,user,table,..) names could probably
  destroy customer data, when connecting to an already running server.
  
  This Changeset contains an auxiliary routine  include/testdb_only.inc" which
  should be sourced by tests doing such dangerous things. 
  The test case will get a "[skipped]" when the environment variable 
  USE_RUNNING_SERVER is not 0 .
  The modified mysql-test-run.sh sets USE_RUNNING_SERVER to 0, when 
  the "mysql-test-run" starts its own server, aka there was no "--extern"
  option.


mysql-test/mysql-test-run.sh:
  If mysql-test-run spawns the server by itself, USE_RUNNING_SERVER will be set to 0 instead of "".
      If the option "--extern" was detected, USE_RUNNING_SERVER will be set to 1 instead of "1".
      Several comparisons have to be changed
           [ -z "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 0 ]
           [ -n "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 1 ]
      USE_RUNNING_SERVER will be exported.

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

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


innobase/include/univ.i:
  Auto merged
sql/item_create.cc:
  Auto merged

    remove a change that broke the test


innobase/include/univ.i:
  remove a change that broke the test
sql/item_create.cc:
  better fix

libmysqld/examples/Makefile.am:
  Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'

  Corrected formatting of comments.
rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.


innobase/include/rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.
innobase/include/rem0rec.h:
  Corrected formatting of comments.

BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

into mysql.com:/my/mysql-4.1

BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0

into mysql.com:/my/mysql-4.1

mysql-test/mysql-test-run.sh:
  Less restricted permissions.
mysql-test/r/rpl_rotate_logs.result:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
mysql-test/t/rpl_rotate_logs.test:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.

client/mysql.cc:
  Fixed Bug#981  ".mysql_history is lost if mysql clinent exit when out of space"
client/mysqlbinlog.cc:
  Fix for mysqlbinlog, mysql_close() needs to be called.
libmysql/Makefile.shared:
  Added use of my_rename()
mysql-test/mysql-test-run.sh:
  Added possibility to add file t/testname.disabled. This will disable a
  test with same base name. Additionally, if the .disabled file contains text,
  it will be appended as a comment after the test during run.

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

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

ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

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

ndb/test/run-test/atrt-mysql-test-run:
  Fix result handling
ndb/test/run-test/daily-basic-tests.txt:
  Move mysql-test-run & testBackup into "basic"
ndb/test/run-test/daily-devel-tests.txt:
  Move mysql-test-run & testBackup into "basic"

sql/sql_parse.cc:
  Fix a comment.
sql/sql_select.cc:
  Fix a comment.