into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

mysql-test/r/ctype_utf8.result:
  Removed test that should have been reverted with gluh's reversion of 
  B-g#21432.
mysql-test/t/ctype_utf8.test:
  Removed test that should have been reverted with gluh's reversion of 
  B-g#21432.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint

  
This change has already been made to 5.1.


CMakeLists.txt:
  Removed dependancy on ib_config.h
  Added conditionals for InnoDB and BDB directories.
innobase/include/univ.i:
  ib_config.h is not required for Windows.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305


mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/t/analyse.test:
  manual merge

mysql-test/r/analyse.result:
  Added Results
mysql-test/t/analyse.test:
  Added test cases to make sure field_str and field_real return correctly.
sql/sql_analyse.cc:
  According the manaul, when declaring a FLOAT(M, N), N equals the number of decimal places and M equals the total number of
  digits in the number.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint

sql/stacktrace.c:
  URL is case sensitive

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


include/mysql_com.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge.
mysql-test/t/ctype_utf8.test:
  Manual merge.

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


mysql-test/r/ctype_utf8.result:
  Manual merge.
mysql-test/t/ctype_utf8.test:
  Manual merge.

client/mysqltest.c:
  Free the dynstr.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/strtod.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/r/ctype_utf8.result:
  Manual merge.

into  mysql.com:/usr/home/ram/work/5.0-maint.b22227

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca

Don't cap threads at 1000 on Windows any more.

The STACK_MIN_SIZE is currently set to 8192, when we actually need 
(emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu 
Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.

I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
word sizes and stack behaviors.

The added test verifies in a cross-platform way that there are no gaps 
between the space that we think we need and what we actually need to report 
an error.

DOCUMENTERS:  This also adds "let" to the mysqltest commands that evaluate
an argument to expand variables therein.  (Only right of the "=", of course.)


client/mysqltest.c:
  Add "let" to the list of mysqltest commands that evaluates its arguments (only
  the right-hand-side of the equals-sign expression).
mysql-test/r/mysqltest.result:
  Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
  expand the backslash test).
mysql-test/t/mysqltest.test:
  Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
  expand the backslash test).
sql/mysql_priv.h:
  Increase the amount we require to be available for the stack, since 
  experience told us that the previous amount was too little by at least
  1044 bytes.
mysql-test/r/execution_constants.result:
  New BitKeeper file ``mysql-test/r/execution_constants.result''
mysql-test/t/execution_constants.test:
  New BitKeeper file ``mysql-test/t/execution_constants.test''

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

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

 - Trying to use unctions declared as static being used from another file, change them to be inline


extra/yassl/taocrypt/mySTL/helpers.hpp:
  Change 'GetMemory' and 'FreeMemory' function te be inline instead of static.

into  mysql.com:/home/gluh/MySQL/Merge/5.0


sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
include/mysql_com.h:
  manual merge
mysql-test/r/ctype_utf8.result:
  manual merge
mysql-test/t/ctype_utf8.test:
  manual merge
sql/sql_acl.cc:
  manual merge

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

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


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

extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/examples/server/server.cpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/crypto.cpp:
  Import patch yassl.diff

mysql-test/mysql-test-run.pl:
  Rewrite the setup of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH to make it easier to modify
  Valgrind need to be run with debug libraries  otherwise it's almost impossible to add
  correct supressions, that means if "/usr/lib/debug" is available, it should be added to
  LD_LIBRARY_PATH

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

netware/BUILD/mwenv:
  Add extra / after $base for winepath to work correctly
  Add / between $base and WINE_BUILD_DIR

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