Corrected results after the fix for bug #12791.
func_test.result, func_test.test:
  Added test cases for bug #12791.
item_func.h, item_func.cc:
  Fixed bug #12791.
  Made LEAST/GREATES fully Oracle compliant.
  LEAST/GREATEST did not return NULL if only some
  arguments were NULLs. This did not comply with Oracle.


sql/item_func.cc:
  Fixed bug #12791.
  Made LEAST/GREATES fully Oracle compliant.
  LEAST/GREATEST did not return NULL if only some
  arguments were NULLs. This did not comply with Oracle.
sql/item_func.h:
  Fixed bug #12791.
  Made LEAST/GREATES fully Oracle compliant.
  LEAST/GREATEST did not return NULL if only some
  arguments were NULLs. This did not comply with Oracle.
mysql-test/t/func_test.test:
  Added test cases for bug #12791.
mysql-test/r/func_test.result:
  Added test cases for bug #12791.
mysql-test/r/null.result:
  Corrected results after the fix for bug #12791.
mysql-test/r/func_str.result:
  Corrected results after the fix for bug #12791.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Max index key length increased from 1024 to 3072
  for 64 bit builds.


sql/unireg.h:
  Max index key length increased from 1024 to 3072
  for 64 bit builds.

No commit message

into mysql.com:/home/psergey/mysql-5.0-rpl-bug

  Simplified and corrected mtr_timer_stop_all()


mysql-test/lib/mtr_timer.pl:
  Simplified and corrected mtr_timer_stop_all()

into mysql.com:/home/psergey/mysql-5.0-rpl-bug


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

sql/item.cc:
  Code cleanup
sql/item.h:
  Code cleanup
sql/log.cc:
  Added comments
sql/sp_head.cc:
  Code cleanup patch from Monty: 
  in subst_spvars()
  - Move local variables first in block
  - Use res|= instead of res |=
  - Use strmake() instead of alloc + memcpy
  Added:
  - Fail the query if we don't have enough memory to produce a binlog-suitable query string: 
    if we're so low on memory we're likely to fail the query anyway, and failing now removes
    the need for hack with THD::query_str_binlog_suitable.
sql/sql_class.cc:
  Remove THD::query_str_binlog_unsuitable
sql/sql_class.h:
  Remove THD::query_str_binlog_unsuitable
sql/sql_delete.cc:
  Remove THD::query_str_binlog_unsuitable
sql/sql_insert.cc:
  Remove THD::query_str_binlog_unsuitable
sql/sql_parse.cc:
  Code cleanup
sql/sql_update.cc:
  Remove THD::query_str_binlog_unsuitable

into  radha.local:/Users/patg/mysql-build/mysql-5.0.clean


sql/ha_blackhole.cc:
  Resolve of fixed typo application to both 4.1 and 5.0

sql/ha_blackhole.cc:
  Typo to DBUG_RETURN fixed

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Auto merged
BitKeeper/etc/config:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_blackhole.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged from 4.1
client/mysqladmin.cc:
  Merged from 4.1
client/mysqlbinlog.cc:
  Merged from 4.1
mysys/charset.c:
  Merged from 4.1

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


configure.in:
  Auto merged
sql/sp_head.cc:
  Auto merged

  Corrected typo


mysql-test/lib/mtr_report.pl:
  Corrected typo
mysql-test/mysql-test-run.sh:
  Corrected typo

mysys/my_alloc.c:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


sql/sql_show.cc:
  Auto merged

into  radha.local:/Users/patg/mysql-build/mysql-4.1

sql/ha_blackhole.cc:
  Blackhole Lock changes to blackhole per Brian, reapplied
sql/ha_blackhole.h:
  blackhold lock changes added per brian

  Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does


include/my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
sql/sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
VC++Files/sql/mysqld.vcproj:
  Aligned engines with Unix version
VC++Files/libmysqld/libmysqld.vcproj:
  Changed spelling "Commerical" to "Commercial"

into mysql.com:/home/psergey/mysql-5.0-bug12335-release2

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0

mysys/Makefile.am:
  Revert a change that breaks (at least) all "max" builds: "mf_keycache.o" is needed.

configure.in:
  Do not use two-level entries like "sql/share", as "automake" fails on them.

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0


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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

  Call mtr_timer_stop_all() at exit
mtr_report.pl, mysql-test-run.pl:
  Added default/ps-protocol/embedded to abort and summary line
mtr_timer.pl:
  Added function mtr_timer_stop_all()


mysql-test/mysql-test-run.pl:
  Added default/ps-protocol/embedded to abort and summary line
mysql-test/lib/mtr_timer.pl:
  Added function mtr_timer_stop_all()
mysql-test/lib/mtr_report.pl:
  Added default/ps-protocol/embedded to abort and summary line
mysql-test/lib/mtr_process.pl:
  Call mtr_timer_stop_all() at exit

into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sp_head.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug12335-release2

BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.

into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333

  Fix typo


sql/ha_innodb.cc:
  Fix typo