sql/sql_select.cc:
  optimizer bug fixed. (what's the difference between s->records ans s->found_records ?)

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


scripts/mysqlhotcopy.sh:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
support-files/mysql.server.sh:
  Auto merged

sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE


BitKeeper/etc/ignore:
  added autom4te.cache/* bdb/dist/autom4te.cache/* innobase/autom4te.cache/*
include/my_alloc.h:
  Small improvement to alloc_root
libmysql/libmysql.c:
  Removed compiler warning
myisam/mi_page.c:
  Better DBUG message
mysql-test/r/multi_update.result:
  Added test with lock tables
mysql-test/r/rpl_replicate_do.result:
  Update results
mysql-test/r/rpl_rotate_logs.result:
  Make test independent of if t1 exists
mysql-test/t/multi_update.test:
  Added test with lock tables
mysql-test/t/rpl_rotate_logs.test:
  Make test independent of if t1 exists
mysys/my_alloc.c:
  Small imprevement to alloc_root
  (Don't free blocks less than ALLOC_MAX_BLOCK_ROOT (4K)
sql/ha_innodb.cc:
  More debug messages
sql/ha_myisam.cc:
  Safety change
sql/lex.h:
  Add support for LIMIT # OFFSET #
sql/lock.cc:
  Added assertion
sql/mysql_priv.h:
  Change of lock handling
sql/mysqld.cc:
  Added function clear_error_messages()
sql/sql_base.cc:
  Change lock handling by open_ltable() and open_and_lock_tables()
sql/sql_class.cc:
  Split THD::THD to two functions
  Move some code from cleanup() to ~THD:THD
  Add THD::change_user()
sql/sql_class.h:
  Prototype changes in class THD
sql/sql_delete.cc:
  Remove locking argument from mysql_delete()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_insert.cc:
  Remove locking argument from mysql_insert()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
  Don't use bulk insert if bulk_insert_buff_size is 0
sql/sql_parse.cc:
  Changes to make mysql_change_user() work as close+connect
  Changed command statistics to use statstics_increment to get more speed
  Update code to handle that locks is now stored in TABLE_LIST
sql/sql_update.cc:
  Remove locking argument from mysql_update()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_yacc.yy:
  Locking type is now stored in TABLE_LIST
  Added support for LIMIT # OFFSET # syntax
  Removed some wrong (never true) checks for SQLCOM_MULTI_UPDATE
mysql-test/t/rpl_replicate_do-slave.opt:
  Changed tables to use t1,t2,...
mysql-test/t/rpl_replicate_do.test:
  Changed tables to use t1,t2,...

  Print an error message if someone tries to call InnoDB startip more than once during process lifetime


innobase/srv/srv0start.c:
  Print an error message if someone tries to call InnoDB startip more than once during process lifetime

  Remove unintentionally pushed printf


sql/ha_innodb.cc:
  Remove unintentionally pushed printf

  Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout


sql/ha_innodb.cc:
  Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout

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

  Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low


sql/ha_innodb.cc:
  Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low

scripts/mysqlhotcopy.sh:
   - added missing "--host" option
sql-bench/test-create.sh:
   - fixed typo
support-files/mysql.server.sh:
   - fixed typo

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


sql/ha_myisam.cc:
  Auto merged

BitKeeper/etc/config:
  Changed Sasha to sys
client/mysqlbinlog.cc:
  Fixed that --position open works.
sql/item_timefunc.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/set_var.cc:
  Portability fix

mysql-test/r/myisam.result:
  updated

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_myisam.cc:
  Auto merged
innobase/row/row0sel.c:
  merged (ul - as 3.23's fix was a backport from 4.0)
mysql-test/r/myisam.result:
  merged - ul

Fix for another optimize bug is undone, as the new one handles both cases.
test added


mysql-test/r/myisam.result:
  updated
mysql-test/t/myisam.test:
  optimize table corruption test
sql/ha_myisam.cc:
  optimize table corruption fixed, though more clean fix is desired.
  Fix for another optimize bug is undone, as the new one handles both cases.

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

  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record


innobase/row/row0sel.c:
  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record

  Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row


innobase/row/row0sel.c:
  Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row

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

  Fix wrong sprintf argument
row0sel.c:
  Fix uninitialized variable error found by Miguel


innobase/row/row0sel.c:
  Fix uninitialized variable error found by Miguel
innobase/dict/dict0load.c:
  Fix wrong sprintf argument

sql/nt_servc.cc:
  Typo fix (duplicate fuctions body)

sql/sql_parse.cc:
  fix for a RANME to empty string

mysql-test/r/select.result:
  Auto merged
sql/sql_base.cc:
  Auto merged

Quote all table names with backticks.  

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

 - fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)


include/myisampack.h:
   - fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)

 - fixed Typo: BIG_TABLE -> BIG_TABLES


include/myisampack.h:
   - fixed Typo: BIG_TABLE -> BIG_TABLES

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

mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_select.cc:
  Merge