into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024


mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/set_var.cc:
  Auto merged

  
The server variable warning_count should include the number of warnings, errors and notes according to the manual


mysql-test/r/user_var.result:
  Added warning_count results.
mysql-test/t/user_var.test:
  Added test case for warning_count.
sql/set_var.cc:
  Added number errors to warning_count.

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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Null Merge
storage/innobase/include/univ.i:
  Null Merge

  
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/my51-bug20305


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

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/bug21449/my51-bug21449


sql/stacktrace.c:
  Auto merged

sql/stacktrace.c:
  URL is case sensitive

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

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


include/mysql_com.h:
  Auto merged
mysql-test/include/have_ndb.inc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476


client/mysqltest.c:
  Auto merged

client/mysqltest.c:
  Free the dynstr.

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


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

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


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
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

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  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/mysql_com.h:
  Auto merged

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


extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
  Auto merged
extra/yassl/taocrypt/src/Makefile.am:
  Auto merged
extra/yassl/taocrypt/test/Makefile.am:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
sql/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

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


BitKeeper/etc/ignore:
  auto-union
netware/Makefile.am:
  Auto merged

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

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


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

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

into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new


sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/sp.result:
  manual merge
mysql-test/t/sp.test:
  manual merge
storage/csv/ha_tina.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge

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

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

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

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

into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint


storage/innobase/srv/srv0start.c:
  Auto merged

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged

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.1-new-maint

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


mysql-test/valgrind.supp:
  Merge suppressions 5.0 -> 5.1

 - Create the file netware/libmysql.imp from libmysql/libmysql.def
 - Remove the outdated netware/libmysql.imp file from version control


BitKeeper/deleted/.del-libmysql.imp:
  Delete: netware/libmysql.imp
BitKeeper/etc/ignore:
  Added netware/libmysql.imp to the ignore list
netware/Makefile.am:
  Build libmysql.imp from libmysql/libmysql.def