Add assertions to check that we do not go out of bounds of io thread status array
os0file.c:
  Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'.


innobase/os/os0file.c:
  Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'.
innobase/fil/fil0fil.c:
  Add assertions to check that we do not go out of bounds of io thread status array

into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0

innobase/dict/dict0dict.c:
  Replace ut_str_contains() with strchr()
innobase/include/ut0mem.h:
  Remove ut_str_contains(), a reinvented strchr()
innobase/row/row0mysql.c:
  Replace ut_str_contains() with strchr()
innobase/ut/ut0mem.c:
  Remove ut_str_contains(), a reinvented strchr()

innobase/ha/ha0ha.c:
  Remove unused first parameter of ha_chain_get_next()
innobase/include/ha0ha.ic:
  Remove unused first parameter of ha_chain_get_next()
  Remove unused function ha_next()

innobase/data/data0data.c:
  Remove unused global variables
innobase/dict/dict0dict.c:
  Remove unused code
innobase/dict/dict0mem.c:
  Remove unnecessary function dict_mem_procedure_create()
innobase/include/dict0dict.h:
  Remove unused code related to stored procedures
innobase/include/dict0dict.ic:
  Remove unnecessary function dict_procedure_get()
innobase/include/dict0mem.h:
  Remove unnecessary code related to stored procedures
innobase/include/dict0types.h:
  Remove dict_proc_t, as procedures are not stored into database
innobase/include/pars0pars.h:
  Remove call_node_struct and references to dict_proc_t,
  as procedures are not stored into database or called by name
innobase/include/pars0sym.h:
  Remove procedure_def, as procedures are not stored into database
innobase/include/pars0types.h:
  Remove call_node_t, as procedures are not called by name

innobase/dict/dict0dict.c:
  dict_create_foreign_constraints_low(): parse CONSTRAINT FOREIGN KEY correctly

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

the extra files being present.

mysql-test/t/timezone.test:
  Fix results when you are in daylight saving time

into mysql.com:/home/my/mysql-4.0

mysql-test/t/bdb-crash.test:
  added newline
sql/ha_berkeley.cc:
  added a commet

into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0

"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"

1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any 
 transactions with the table.. 


mysql-test/r/bdb-crash.result:
  added test for bug #2342 
  "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
mysql-test/t/bdb-crash.test:
  added test for bug #2342 
  "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
sql/ha_berkeley.cc:
  fixed bug #2342 
  "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
  
  we have to return new status "HA_ADMIN_REJECT" for ha_berkley::analyze 
  if there are any transaction for this table 
  so as bdb documentation says:
  "The DB->stat method cannot be transaction protected"
sql/handler.h:
  added new status of table info "HA_ADMIN_REJECT"
  
  We have to return this status for bdb tables which 
  have any active transactions so as bdb-documentation says:
  "The DB->stat method cannot be transaction-protected"
sql/sql_table.cc:
  added processing of the new status HA_ADMIN_REJECT in mysql_admin_table
  (reason to add this status is explained in comment 
  for commit on sql/handler.h)

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

into hundin.mysql.fi:/home/heikki/mysql-4.0

  Backport from 4.1: make mem_current_allocated_memory global variable


innobase/mem/mem0dbg.c:
  Backport from 4.1: make mem_current_allocated_memory global variable

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  result of the test case for FORCE INDEX on ORDER BY
order_by.test:
  test case for FORCE INDEX on ORDER BY
sql_select.cc:
  Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause


sql/sql_select.cc:
  Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause
mysql-test/t/order_by.test:
  test case for FORCE INDEX on ORDER BY
mysql-test/r/order_by.result:
  result of the test case for FORCE INDEX on ORDER BY

into mysql.com:/home/my/mysql-4.0

This fixed a bug in SELECT DISTINCT when all selected parts where constants. (Bug #3203)


myisam/mi_create.c:
  Allow keys with 0 segements.
mysql-test/r/myisam.result:
  Test for problem with SELECT DISTINCT
mysql-test/t/myisam.test:
  Test for problem with SELECT DISTINCT

into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0

mysql-test/r/alter_table.result:
  Updated tests
mysql-test/t/alter_table.test:
  Updated tests

BitKeeper/etc/logging_ok:
  auto-union
scripts/mysqlbug.sh:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/alter_table.test:
  Merge code with 3.23
sql/nt_servc.cc:
  use original code

service backport from 4.0


mysql-test/t/alter_table.test:
  Improved test case
sql/nt_servc.cc:
  service backport from 4.0
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into sanja.is.com.ua:/home/bell/mysql/bk/work-alter-3.23

cleanup (VERSION variable)

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

bug#3134


BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
  Delete: BitKeeper/triggers/post-incoming
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
  Delete: BitKeeper/triggers/post-outgoing

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

Shouldn't be moved to 4.1


myisam/mi_check.c:
  only set key_map if necessary

into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0


mysys/default.c:
  Auto merged

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

mysql-test/t/alter_table.test:
  test for BUG#3270 added

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Delete: VC++Files/libmysql/libmysql.def
VC++Files/innobase/innobase.dsp:
  'com' module no longer exists.
VC++Files/strings/MASM6x/strings.dsp:
  Add strnlen
VC++Files/strings/strings.dsp:
  Add strnlen

  Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically


innobase/sync/sync0sync.c:
  Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically