into  trift2.:/MySQL/M51/merge-5.1


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Null-merge: 5.0 version number upgrade only, irrelevant for 5.1

into  trift2.:/MySQL/M50/merge-5.0


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-engines

The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".


mysys/thr_alarm.c:
  After-merge fix:
  In 4.1, the variable "thr_client_alarm" is declared in this module.

into  trift2.:/MySQL/M41/merge-4.1


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Not applicable to 4.1 in its current state.
sql/mysqld.cc:
  Change was a backport already, null-merged to 4.1.

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysys/my_thr_init.c:
  Auto merged

Companion change to this one
   ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
     include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...


include/config-win.h:
  Companion change to this one
     ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
       include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
  which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/mysql_priv.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M51/push-5.1

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/mysql_priv.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysys/my_pthread.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysys/my_pthread.c:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


mysys/my_pthread.c:
  SCCS merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/select.result:
  SCCS merged
mysql-test/t/select.test:
  SCCS merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/item.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807


BitKeeper/etc/collapsed:
  auto-union
mysys/mf_iocache.c:
  Auto merged

Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.


mysys/mf_iocache.c:
  If we detect early that the file is not tell()able, then we should
  assume that it's also not seek()able and therefore we should never
  set the (poorly named) "seek_not_done" flag so that we don't immedi-
  ately try to seek() when reading later.
  
  The problem was that tell() was returning -1, so when we read later, 
  we needlessly tried to seek to position  (unsigned long) -1 . 
  
  Also, if we think we're supposed to seek to a position in a file and 
  the file is un-tell()able, then abort.

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/view.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/view.test:
  Manual merge

into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt

into  chilla.local:/home/mydev/mysql-5.1-bug25460

into  chilla.local:/home/mydev/mysql-5.1-bug25460-old

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge

Under high load it was possible that memory mapping was started on a table
while other threads were working with the table.

I fixed the start of memory mapping so that it is done at the first table
open or when the requesting thread is using the table exclusively only.


include/my_base.h:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Added a new MyISAM open_flag HA_OPEN_MMAP.
storage/myisam/ha_myisam.cc:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Replaced the call to mi_extra(... HA_EXTRA_MMAP ...) by the new open_flag
  HA_OPEN_MMAP. This effects that the mapping will no longer be done on
  every open of the table but just on the initial open, when the MyISAM
  share is created.
storage/myisam/mi_dynrec.c:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Added a comment with a concern regarding the mmap flag MAP_NORESERVE.
storage/myisam/mi_extra.c:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Limited the start of memory mapping to situations where the requesting
  thread has the table exclusively opened.
storage/myisam/mi_open.c:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Added memory mapping code. Used if the new open_flag HA_OPEN_MMAP is set.

  Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed


BitKeeper/deleted/.del-README.txt-renamed:
  Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/mysql_priv.h:
  Auto merged