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

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

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

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

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

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

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

BitKeeper/triggers/post-commit:
  send to correct address.

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

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

    Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.


sql/item_func.cc:
  Improved check for thread identity in the "embedded" case,
  provided by Monty.
  
  This finishes the fixes for bug#27078.

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

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

https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally


BitKeeper/triggers/post-commit:
  1) Add additional method of detecting merge changesets.
  2) Remove code sending e-mail to dev-public@ or dev-bugs@.
  3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.

    Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.


VC++Files/sql/mysqld.vcproj:
  Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.

  Corrected name of mysql_thread_{init,end} (bug#29007)


libmysqld/libmysqld.def:
  Corrected name of mysql_thread_{init,end} (bug#29007)

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

  Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
mysql.sln:
  Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
  not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)


VC++Files/mysql.sln:
  Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
  not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)
VC++Files/mysqldemb/mysqldemb.vcproj:
  Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)

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

	protocol

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar. 



sql/sql_parse.cc:
  Cast *passwd to get rid of the sign, so that sign extension doesn't
  cause the sequence 125, 126, 127, 4294967169, 4294967170.

Still part of the fix for bug#27078.


libmysqld/lib_sql.cc:
  Some platforms need a cast.
  Still part of the fix for bug#27078.

but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision


libmysqld/lib_sql.cc:
  Avoid casting a pointer to a (possibly) int, which will not compile on some platforms:
  Do not use the "thd" pointer to identify a thread in the embedded lib,
  but rather use the "thread_id" counter.
  
  Patch is proposed by Monty.  Fixes bug#27078.

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

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  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge

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

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

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


configure.in:
  Auto merged

forbid the use of subselect in PURGE LOGS BEFORE command


mysql-test/r/subselect.result:
  test result
mysql-test/t/subselect.test:
  test case
sql/sql_yacc.yy:
  forbid the use of subselect in PURGE LOGS BEFORE command

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"

            corruption errors: 126,134,145

When one thread attempts to lock two (or more) tables and another
thread executes statement that aborts these locks (e.g. REPAIR
TABLE) we may get a table object with wrong lock type in a table
cache.

For example if SELECT FROM t1,t2 was aborted, subsequent INSERT
INTO t1 may be executed under read lock.

As a result we may get various table corruptions and even a server
crash.

This is fixed by resetting lock type in case lock was aborted by
another thread.

I failed to create reasonable test case for this bug.


sql/lock.cc:
  If thr_multi_lock was aborted by another thread, it unlocks tables
  that were locked before one that was aborted. Lock type for tables
  that were after a table that was aborted preserved. Thus we need
  to reset lock data in case thr_multi_lock was aborted.

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