away (old .Plo files in them showed to cause build problems for at
least another dev and me, and they also cause problems after .c->.cc
renames).


BUILD/FINISH.sh:
  use distclean in BUILD/compile* scripts to make sure .deps dirs go away (old .Plo files in them showed to
  +cause build problems for at least another dev and me).

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


sql/sql_table.cc:
  Auto merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged

  Added check for duplicate column in key
  Added tests and fixed tests which exploit bug


mysql-test/r/delete.result:
  Fix test as it exploited Bug#6252
mysql-test/r/innodb.result:
  Test for Bug#6126
mysql-test/r/key.result:
  Test for Bug#6126/6252
mysql-test/r/type_blob.result:
  Fix test as it exploited Bug#6252
mysql-test/t/delete.test:
  Fix test as it exploited Bug#6252
mysql-test/t/innodb.test:
  Test for Bug#6126
mysql-test/t/key.test:
  Test for Bug#6126/6252
mysql-test/t/type_blob.test:
  Fix test as it exploited Bug#6252
sql/sql_table.cc:
  Bug#6252 - Duplicate columns in keys should fail
    Added check for duplicate column.

BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged

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

  bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705


mysql-test/r/fulltext.result:
  bug#6705
mysql-test/t/fulltext.test:
  bug#6705
myisam/ft_boolean_search.c:
  bug#6705 - (+trunc1* +trunc2*)

into mysql.com:/space/my/mysql-4.1-build

BitKeeper/etc/ignore:
  Added ac_available_languages_fragment to the ignore list

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

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

into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final

innobase/buf/buf0buf.c:
  Added a sanity check for buffer_pool_pages_latched status variable.
  The lack of this check resulted in weird result on windows.

  Better variable names in dump.
  Dump tertiary weight in reverse order, to sort upper letters before their lower counterparts.


strings/uca-dump.c:
  Better variable names in dump.
  Dump tertiary weight in reverse order, to sort upper letters before their lower counterparts.

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

range for BETWEEN typo fixed


extra/perror.c:
  meaningless error message fixed
heap/hp_rfirst.c:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
mysql-test/r/heap.result:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
mysql-test/r/range.result:
  range for BETWEEN typo fixed
mysql-test/t/heap.test:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
sql/handler.cc:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
sql/sql_select.cc:
  range for BETWEEN typo fixed

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

into hundin.mysql.fi:/home/jan/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-bg6462

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

into mysql.com:/home/dlenev/src/mysql-4.1-bg6462


sql/set_var.cc:
  Auto merged

results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).

To perform proper cleanup for statements that can contain subqueries 
but don't have main select we must call free_undelaid_joins().


mysql-test/r/subselect.result:
  Added test for bug #6462 "Same request on same data returns different
  results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
  statements".
mysql-test/t/subselect.test:
  Added test for bug #6462 "Same request on same data returns different
  results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
  statements".
sql/set_var.cc:
  Added missing cleanup of joins used in subqueries to SET statement.
sql/sql_do.cc:
  Added missing cleanup of joins used in subqueries to DO statement.

  Mofidications to dump secondary and tertiary weigthts
  And some minor improvements


strings/uca-dump.c:
  Mofidications to dump secondary and tertiary weigthts
  And some minor improvements

innobase/row/row0sel.c:
  Fixed bug: innodb_locks_unsafe_for_binlog still uses next-key locking (BUG #6747).
  We do not take gap type locks when using InnoDB startup option 
  innodb_locks_unsafe_for_binlog. Some code polishing also done.

- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
  for binary collations but for case sensitive collations as well. 

  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
lock0lock.c:
  Let SHOW INNODB STATUS print the history list length


innobase/lock/lock0lock.c:
  Let SHOW INNODB STATUS print the history list length
innobase/trx/trx0purge.c:
  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
innobase/trx/trx0undo.c:
  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004

into sanja.is.com.ua:/home/bell/mysql/bk/work-check-5.0

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

include/mysqld_error.h:
  checksum error message
sql/share/czech/errmsg.txt:
  checksum error message
sql/share/danish/errmsg.txt:
  checksum error message
sql/share/dutch/errmsg.txt:
  checksum error message
sql/share/english/errmsg.txt:
  checksum error message
sql/share/estonian/errmsg.txt:
  checksum error message
sql/share/french/errmsg.txt:
  checksum error message
sql/share/german/errmsg.txt:
  checksum error message
sql/share/greek/errmsg.txt:
  checksum error message
sql/share/hungarian/errmsg.txt:
  checksum error message
sql/share/italian/errmsg.txt:
  checksum error message
sql/share/japanese/errmsg.txt:
  checksum error message
sql/share/korean/errmsg.txt:
  checksum error message
sql/share/norwegian-ny/errmsg.txt:
  checksum error message
sql/share/norwegian/errmsg.txt:
  checksum error message
sql/share/polish/errmsg.txt:
  checksum error message
sql/share/portuguese/errmsg.txt:
  checksum error message
sql/share/romanian/errmsg.txt:
  checksum error message
sql/share/russian/errmsg.txt:
  checksum error message
sql/share/serbian/errmsg.txt:
  checksum error message
sql/share/slovak/errmsg.txt:
  checksum error message
sql/share/spanish/errmsg.txt:
  checksum error message
sql/share/swedish/errmsg.txt:
  checksum error message
sql/share/ukrainian/errmsg.txt:
  checksum error message
sql/sql_table.cc:
  fixed layout
  fixed comment
  allow cocalization of error

into mysql.com:/orca/space/pekka/ndb/version/my41