into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge

netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)

into  amd64.(none):/src/bug24400/my41-bug24400

into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint

 - Add funtion "query_get_value to allow reading a fields value
   into a $variable


client/mysqltest.c:
  - Add function "let $var= query_get_value(<query>,<colname>,<row>)"
    making it possible to read a value from a specific field in a query 
    into a $variable.
mysql-test/r/mysqltest.result:
  Add test cases for "query_get_value"
mysql-test/t/mysqltest.test:
  Add test cases for "query_get_value"

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41

  Added --with-mysqld-libs configure flag


configure.in:
  Added --with-mysqld-libs configure flag
sql/Makefile.am:
  Added --with-mysqld-libs configure flag

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

 - Check that filemode was set to 0000


mysql-test/mysql-test-run.pl:
  Checking for "running as root" should also read the filemode to see it 
  was properly set to 0000

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

 - Final touchups


client/mysqltest.c:
  Final touch ups, rename sorted_results to sorted_result
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Update results with additional subtests for empty result set,
  NULL values and 1024 rows

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb

  review comment 2, atleast 1 signal need for test prg


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  review comment, atleast 1 signal need

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb

  review comment
  if some tcp-transporter has data, then do select with timeout 0


ndb/src/common/transporter/TransporterRegistry.cpp:
  review comment
  if some tcp-transporter has data, then do select with timeout 0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb

  Make sure that data can not e left lingering in receive buffer


ndb/src/common/transporter/Packer.cpp:
  test, make MAX_RECEIVED_SIGNALS an variable
ndb/src/common/transporter/TCP_Transporter.hpp:
  add new method for checking of data in receive buffer
ndb/src/common/transporter/TransporterRegistry.cpp:
  Make sure that 
  1) poll_TCP return true if any transporter has data in receiveBuffer
     (previously only if socket had data)
  2) performReceive executes signals if TCP transporter has data in receiveBuffer
     (previously only if data was recevied)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  test, make MAX_RECEIVED_SIGNALS an variable
ndb/test/ndbapi/testNdbApi.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

into  siva.hindu.god:/home/tsmith/m/bk/maint/41

BUG#25712 - insert delayed and check table run together report crashed
            tables
Fixed wrongly applied patch.

BUG#25712 - insert delayed and check table run together report
            crashed tables

Let MY_THREADSAFE have distinct value. Some functions call my_seek
passing MyFlags argument directly to it. This may cause unnecessary
locks, which may finally lead to a dead-lock (specifically see my_lock).


include/my_sys.h:
  Addition to fix for
  BUG#25712 - insert delayed and check table run together report
              crashed tables
  
  Let MY_THREADSAFE have distinct value. Some functions call my_seek
  passing MyFlags argument directly to it. This may cause unnecessary
  locks, which may finally lead to a dead-lock (specifically see my_lock).
  
  Also it doesn't affect my_pread/my_pwrite in any way. So the comment was
  updated.

- Correct bad path in project files.


VC++Files/sql/mysqld.dsp:
  Bug#24400 Source files for Server: Visual Studio Workspace contains a small config bug
  - Correct bad path.

            tables

In case system doesn't have native pread/pwrite calls (e.g. Windows)
and there is CHECK TABLE runs concurrently with another statement that
reads from a table, the table may be reported as crashed.

This is fixed by locking file descriptor when my_seek is executed on
MyISAM index file and emulated pread/pwrite may be executed concurrently.

Affects MyISAM tables on platforms that do not have native
pread/pwrite calls (e.g. Windows).

No deterministic test case for this bug.


myisam/mi_check.c:
  Key file descriptor is shared among threads and mixed set of
  my_pread/my_pwrite and my_seek calls is possible. This is not
  a problem on systems that have native pread/pwrite calls.
  
  In case system doesn't have native pread/pwrite calls (e.g. Windows)
  we must ensure that my_pread/my_pwrite are not executed at the same
  time with my_seek. This is done by passing MY_THREADSAFE flag to
  my_seek.
mysys/my_seek.c:
  On platforms that do not have native pread/pwrite calls (e.g. Windows)
  these calls are emulated as follow: lock fd, lseek, read, unlock fd.
  
  In case file descriptor is shared among threads, where one thread
  executes my_pread and another thread executes my_seek, we may read
  from a wrong position. This may happen because my_seek doesn't lock
  fd and thus may be executed by another thread after emulated pread
  has done lseek and before it has done read.
  
  To fix problem mentioned above we introduce new flag MY_THREADSAFE to
  my_seek, which is meaningful only in case pread/pwrite calls are
  emulated. If this flag is set, lseek operation is performed as follow:
  lock fd, seek, unlock fd.

 - Fix spelling error


mysql-test/mysql-test-run.pl:
  Fix spelling error

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build

 - Change from "query_sorted <query>" to "sorted_results"


client/mysqltest.c:
  Replace "query_sorted <query>" with the ability to turn
  on "one shot result sorting" with the command "sorted_results"
mysql-test/r/mysqltest.result:
  Update test and result
mysql-test/t/mysqltest.test:
  Update test and result

client/mysqltest.c:
  Make it possible for test scripts to know what protocol is being used

into  vajra.(none):/opt/local/work/mysql-4.1-runtime

for a query over an empty table right after its creation. 
The crash is the result of an attempt made by JOIN::optimize to evaluate
the WHERE condition when no records have been actually read.
The added test case can reproduce the crash only with InnoDB tables and
only with 5.0.x.
 


mysql-test/r/innodb_mysql.result:
  Added a test case for bug #28272.
mysql-test/t/innodb_mysql.test:
  Added a test case for bug #28272.
sql/sql_select.cc:
  Fixed bug #28272: crash that occurs when running an EXPLAIN command
  for a query over an empty table right after its creation. 
  The crash is the result of an attempt made by JOIN::optimize to evaluate
  the WHERE condition when no records have been actually read.
  Such attempts could be observed only with EXPLAIN commands.
  Now at the optimization phase the WHERE condition is never evaluated if 
  there is no record previously read from the table.

statement from a UNION query with ORDER BY an expression containing
RAND().
The crash happened because the global order by list in the union query
was not re-initialized for execution.
(Local order by lists were re-initialized though).



mysql-test/r/ps.result:
  Added a test case for bug #27937.
mysql-test/t/ps.test:
  Added a test case for bug #27937.
sql/sql_union.cc:
  Fixed bug #27937: crash for the the second execution of a prepared
  statement from a UNION query with ORDER BY an expression containing
  RAND().
  The crash happened because the global order by list in the union query
  was not re-initialized for execution.
  (Local order by lists were re-initialized though).
  Added re-initialization of the global order by list in the function
  st_select_lex_unit::init_prepare_fake_select_lex.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work

- Give some more protection against "too long socket name by setting the max
length when to use a tmpdir for sockets to 70 


mysql-test/mysql-test-run.pl:
  Give some more protection against "too long socket name by setting the max
  length when to use a tmpdir for sockets to 70

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

 - Change "exec rm" to "remove_file"


mysql-test/t/outfile.test:
  Change "exec rm" to "remove_file"