into sinisa.nasamreza.org:/mnt/work/mysql-4.0

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

into hegel.local:/home/miguel/dev/mysql-4.0

  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST


sql/ha_innodb.cc:
  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST

mysql-test/r/merge.result:
  test added
mysql-test/t/merge.test:
  test added

  Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle


sql/ha_innodb.cc:
  Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle

  Make SHOW INNODB STATUS aware when we are estimating index range size etc.


sql/ha_innodb.cc:
  Make SHOW INNODB STATUS aware when we are estimating index range size etc.

  Fix a typo


sql/ha_innodb.cc:
  Fix a typo

  Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing


sql/ha_innodb.cc:
  Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing

  Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded


innobase/srv/srv0srv.c:
  Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded

  Print also the thread ids in SHOW INNODB STATUS also in Linux


innobase/trx/trx0trx.c:
  Print also the thread ids in SHOW INNODB STATUS also in Linux

Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE


include/my_global.h:
  Guard against compiling without -fno-exceptions
include/my_pthread.h:
  Allocate bigger default thread stack because of problems with glibc
mysql-test/r/null.result:
  Updated result
mysql-test/t/null.test:
  Test of using UPDATE/INSERT with NULL on not null fields.
sql/field_conv.cc:
  Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
sql/sql_load.cc:
  Fixed bug in replication when using auto_increment and LOAD DATA INFILE

  Backport the InnoDB HANDLER bug fix from 4.1


sql/sql_handler.cc:
  Backport the InnoDB HANDLER bug fix from 4.1

sql/net_pkg.cc:
  Fixing a buffer overflow with huge BLOB's.
  This bug was caused by increasing a storage for lenght of
  data, while memory was not sufficiently allocated for the task.

  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it


innobase/row/row0purge.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/btr/btr0cur.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/btr/btr0btr.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/include/btr0btr.h:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/include/btr0cur.h:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards


innobase/srv/srv0srv.c:
  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards

  Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
ha_innodb.cc:
  Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error


sql/ha_innodb.cc:
  Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error
innobase/trx/trx0trx.c:
  Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards

grant on database.* to xx@yy with grant option;

is done.



sql/item.cc:
  fix for update of non-null column with function returning NULL

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat.
When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.


sql/item_cmpfunc.cc:
  Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.
sql/log_event.cc:
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
sql/sql_load.cc:
  When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.

BUILD/compile-alpha-cxx:
  Don't do depend files with Compaq compiler
configure.in:
  Don't do depend files with Compaq compiler
extra/mysql_waitpid.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Better timeout for valgrind

Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.


include/my_base.h:
  Don't count NULL values in cardinalty
myisam/mi_check.c:
  Don't count NULL values in cardinalty
myisam/mi_extra.c:
  Free row buffer cache after each query
myisam/mi_open.c:
  Avoid realloc if cache size doesn't change
myisam/mi_search.c:
  Don't count NULL values in cardinalty
myisam/myisamdef.h:
  Change buffer length from uint to uint32 to make it more portable/predictable
mysql-test/r/myisam.result:
  Test case for cardinality with NULL keys and FORCE INDEX
mysql-test/t/myisam.test:
  Test case for cardinality with NULL keys and FORCE INDEX
sql/lex.h:
  Added table join option FORCE INDEX
sql/mysql_priv.h:
  Added table join option FORCE INDEX
sql/opt_range.cc:
  Added table join option FORCE INDEX
sql/sql_base.cc:
  Added table join option FORCE INDEX
sql/sql_lex.h:
  Added table join option FORCE INDEX
sql/sql_parse.cc:
  Added table join option FORCE INDEX
  Don't use strlen() on hostname without first checking if it's not NULL
sql/sql_select.cc:
  Added table join option FORCE INDEX
sql/sql_yacc.yy:
  Added table join option FORCE INDEX
sql/table.h:
  Added table join option FORCE INDEX

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

  no _mi_search_next() bug fixed


myisam/ft_nlq_search.c:
  no _mi_search_next() bug fixed

Fix for SHOW VARIABLES in embedded server


Docs/internals.texi:
  Added documentation for join_buffer_size
configure.in:
  Changed version number
sql/log_event.cc:
  Fix for bug in LOAD DATA INFILE
sql/log_event.h:
  Fix for bug in LOAD DATA INFILE
sql/slave.cc:
  Fix for bug in LOAD DATA INFILE
sql/sql_show.cc:
  Fix for SHOW VARIABLES in embedded server

sql/sql_show.cc:
  fix embedded server crash

  Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries


innobase/mem/mem0pool.c:
  Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries