into  anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge

Dropping an user defined function may cause server crash in
case this function is still in use by another thread.

The problem was that our hash implementation didn't update
hash link list properly when hash_update() was called.


mysys/hash.c:
  The following requirement wasn't met by hash_update() function
  causing corruption of hash links list:
  
  After a record was unlinked from the old chain during update, it
  holds random position. By the chance this position is equal to
  position for the first element in the new chain. That means
  updated record is the only record in the new chain.

Sometimes special 0 ENUM values was ALTERed to normal
empty string ENUM values.

Special 0 ENUM value has the same string representation
as normal ENUM value defined as '' (empty string).
The do_field_string function was used to convert
ENUM data at an ALTER TABLE request, but this
function doesn't care about numerical "indices" of
ENUM values, i.e. do_field_string doesn't distinguish
a special 0 value from an empty string value.

A new copy function called do_field_enum has been added to
copy special 0 ENUM values without conversion to an empty
string.


sql/field_conv.cc:
  Fixed bug #29251.
  The Copy_field::get_copy_func method has been modified to
  return a pointer to the do_field_enum function if a conversion
  between two columns of incompatible enum types is required.
  The do_field_enum function has been added for the correct
  conversion of special 0 enum values.
mysql-test/t/type_enum.test:
  Updated test case for bug #29251.
mysql-test/r/type_enum.result:
  Updated test case for bug #29251.

into  gleb.loc:/home/uchum/work/bk/4.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B29116-4.1-opt

 counters from relay

Updated the test to return columns vertically.


mysql-test/r/rpl_change_master.result:
  Bug #29116: test updated
mysql-test/t/rpl_change_master.test:
  Bug #29116: test updated

we use net->vio in my_net_local_init, but in the my_net_init
implementation we set it after the call, so work with unspecified
net->vio value


sql/net_serv.cc:
  Bug #29117 (init_file test crashes with embedded server)
  
  as we started using net->vio in my_net_local_init, we should set
  it before the call

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