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

unlink socket file if mysqld dies on startup
Some optimization of AND expressions


mysql-test/r/func_time.result:
  Update for new week() handling
mysql-test/t/func_time.test:
  Update for new week() handling
sql/item_cmpfunc.cc:
  Optimization of IF( and-expression,,)
sql/item_cmpfunc.h:
  Optimization of AND expressions
sql/item_timefunc.cc:
  Extended WEEK() to be able to handle ISO weeks.
sql/mysqld.cc:
  unlink socket file if mysqld dies on startup
sql/sql_base.cc:
  Fixed problem with SIGHUP and INSERT DELAYED
tests/Makefile.am:
  Added missing myisam-big-rows.tst file to source distribution

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

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

This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL


mysql-test/r/bdb.result:
  Fix results after serges last patch
mysql-test/r/innodb.result:
  Fix results after serges last patch
mysql-test/r/null.result:
  Update for new AND handling of NULL
scripts/mysqld_safe.sh:
  Fix 'isroot' test to work even if user is not root
sql/item.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_base.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_parse.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_select.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_yacc.yy:
  Fixed that NULL and 0 returns 0 instead of NULL

   "head/tail -n <num>" instead

 - fixed yet another wrong result after error messages had been changed


mysql-test/r/bdb.result:
   - fixed yet another wrong result after error messages had been changed

 - fixed test results after error messages had been modified


mysql-test/r/innodb.result:
   - fixed test results after error messages had been modified

into geopard.(none):/storage/bk/mysql-3.23


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union

innobase/log/log0log.c:
  Removed compiler warnings

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