client/mysqltest.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged

into moonbone.local:/work/14186-bug-4.1-mysql


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements


mysql-test/r/func_sapdb.result:
  Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/type_newdecimal.result:
  Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/user_var.result:
  More test with SELECT @A:=
mysql-test/t/disabled.def:
  Enable user_var.test for
mysql-test/t/user_var.test:
  More test with SELECT @A:=
sql/item.cc:
  Simple optimization during review of new code
sql/item_func.cc:
  Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.h:
  timediff() can return NULL for not NULL arguments
sql/sql_base.cc:
  Remove usage of current_thd() in mysql_make_view()
sql/sql_lex.h:
  Remove usage of current_thd() in mysql_make_view()
sql/sql_select.cc:
  Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements
sql/sql_view.cc:
  Remove usage of current_thd() in mysql_make_view()
  Simple optimization of new code
sql/sql_view.h:
  Remove usage of current_thd() in mysql_make_view()
sql/table.cc:
  Simple optimization of new code

mysql-test/r/analyse.result:
  test result fixed
mysql-test/t/disabled.def:
  user_var disabled
sql/sql_analyse.cc:
  rounding added

Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values


myisam/mi_check.c:
  keyoffset is not a position (no %lx here)
mysql-test/r/func_sapdb.result:
  Fixed test after marking that timediff() can return NULL
sql/item_func.cc:
  Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.cc:
  Mark that add_time and str_to_date() can return null values
sql/item_timefunc.h:
  Mark that time_diff can return 0
sql/spatial.cc:
  Simple cleanups during review of new code

mysql-test/r/analyse.result:
  test result fixed
sql/sql_analyse.cc:
  missing sqrt(std_sqr) added

mysql-test/r/gis.result:
  test result fixed

into  mysql.com:/usr/home/ram/work/mysql-4.1

  Make IM ports change with MTR_BUILD_THREAD


mysql-test/mysql-test-run.pl:
  Make IM ports change with MTR_BUILD_THREAD

client/mysqltest.c:
  Fixed crash bug in debug mode and make sure q->last_argument is set right
  so that check_eol_junk() will work again.

client/mysqltest.c:
  Removed C++-isms from C file.

get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).


client/mysqltest.c:
  Check for NULLs only if we don't replace column results,
  get real results after all checks.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


client/mysqlimport.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merged from 4.1.
mysql-test/r/mysqldump.result:
  Merged from 4.1.
mysql-test/t/gis.test:
  Merged from 4.1.

into deer.(none):/home/hf/work/mysql-4.1.12839


sql/field.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

sql/field.cc:
  This code still could work for VERY out-of-dated databases
sql/spatial.cc:
  small syntax fixes

into mysql.com:/home/psergey/mysql-5.0-oct25-test

sql/sql_lex.h:
  Minor fix of a comment.
sql/table.h:
  Minor fix of a comment.

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

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

into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1

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

include/config-netware.h:
  Merged
innobase/row/row0ins.c:
  BUG#10511: Per alexi's instructions, the changes in innobase/row/row0ins.c are not 
  propagated to 5.x
mysql-test/r/create.result:
  Auto Merged
mysql-test/t/create.test:
  Auto Merged
sql/field.cc:
  Auto Merged
sql/field.h:
  Manual Merge
sql/sql_table.cc:
  Auto Merged

into mysql.com:/home/psergey/mysql-5.0-oct25-test

into moonbone.local:/work/14138-bug-5.0-mysql

  After merge fix


sql/sql_select.cc:
  After merge fix

into  frost.snake.net:/Users/paul/bk/mysql-5.0


client/mysqldump.c:
  Auto merged

mysql-test/t/analyse.test:
  Auto merged
sql/sql_select.h:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-oct25-test

sql/sql_update.cc:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

into mysql.com:/home/psergey/mysql-4.1-bug14139

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


sql/item_func.cc:
  Auto merged

mysql-test/r/type_newdecimal.result:
  Update result

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_prepare.cc:
  Auto merged

extra/yassl/taocrypt/src/Makefile.am:
  Build libtaoint first and then link the .o file from that into libtaocrypt.a

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

into  mysql.com:/home/alexi/dev/mysql-4.1-10511