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


innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names


innobase/fil/fil0fil.c:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/include/dict0dict.h:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/dict/dict0dict.c:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names

into mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged

into mysql.com:/M50/mysql-5.0

into mysql.com:/home/jimw/my/mysql-4.1-clean

config/ac-macros/misc.m4:
  Add detection of struct rlimit

into mysql.com:/home/jimw/my/mysql-5.0-build


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

acinclude.m4:
  Fix typo

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


sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into mysql.com:/usr/home/ram/work/5.0.b9489

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

myisam/mi_key.c:
  A fix (bug #10176: problem with varchar keys).
  Should skip key pack length for 'old' too.

absolute path".

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita


mysql-test/r/blackhole.result:
  Auto merged

no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).


mysql-test/r/blackhole.result:
  result update
mysql-test/t/blackhole.test:
  checking that statements get into binlog even when they were affecting
  no rows of the blackhold engine. So that this engine can serve as
  a binlog propagator (A->B->C replication where B has only blackhole tables,
  B receives binlog from A, applies it to blackhole tables, writes statements
  to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.

option in my.cnf correctly"

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

parameter problems.

include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.

into mysql.com:/usr/home/ram/work/mysql-5.0

Doc fix for Bug#9870.
 

mysys/charset.c:
  A fix (bug #9756: mysql client failing on dumps containing certain \ sequences).
  As 'to_end' points to the last position we should use '>' comparison 
  instead of '>=' there.
  'l' replaced with 'tmp_length' (in order not to mix 'l' with '1').

config/ac-macros/openssl.m4:
  "Configure" variable 'IS_LINUX' renamed to 'TARGET_LINUX'.
  Manual merge: In 4.1, this was in 'acinclude.m4'.
include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.

Post-merge fix will follow.


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Automerge / manual check.
configure.in:
  Automerge / manual check.
include/my_global.h:
  Automerge / manual check.
myisam/Makefile.am:
  Automerge / manual check.
scripts/Makefile.am:
  Automerge / manual check.
scripts/mysqld_safe.sh:
  Automerge / manual check.
support-files/Makefile.am:
  Automerge / manual check.
tools/mysqlmanager.c:
  Automerge / manual check.

acinclude.m4:
  Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE
  Add test to get type of 'struct rlimit'
  Switch order of including stdlib.h and declaration being tested to
  match how it will be used in regular code.
configure.in:
  Call MYSQL_TYPE_STRUCT_RLIMIT macro
sql/mysqld.cc:
  Use STRUCT_RLIMIT for getting type of struct rlimit.

BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan.

  Changed function signature to fix compile errors with Whidbey


regex/regerror.c:
  Changed function signature to fix compile errors with Whidbey

configure.in:
  - fixed NDB_VERSION_BUILD to have the correct number (4->5)

- bumped up version number in configure.in to 5.0.6 now that engineering branched off for the 5.0.5 builds
- tagged ChangeSet 1.1882 as the "clone-5.0.5-build" branchoff point


configure.in:
  - bumped up version number to 5.0.6 now that engineering branched off for the 5.0.5 builds

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

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


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

  post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.


ndb/test/ndbapi/testOperations.cpp:
  Test case also for abort case.
    (abort if not lock owner still fails!)