into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged

 - Export 'check_const_len_init' from udf_example.dll


sql/udf_example.def:
  - Export 'check_const_len_init' from udf_example.dll

into  pilot.(none):/data/msvensson/mysql/my51-bug29804

 - Fix warnings
 - Export 'check_const_len' from udf_example.dll


sql/udf_example.c:
  Fix warnings
sql/udf_example.def:
  Add 'check_const_len' function to be exported from udf_example.dll

mysql-test/r/mysqlbinlog2.result:
  Change test case to remove server version number.
mysql-test/t/mysqlbinlog2.test:
  Change test case to remove server version number.
mysys/mf_iocache2.c:
  Correcting bad merge.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

also fix "while" and "connect"
It's now possible to write "if("


client/mysqltest.c:
  Don't require a space between for example "if" and "(". This should
  also fix "while" and "connect"
mysql-test/t/mysqltest.test:
  Remove space between if and ( to check it works

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


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

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/r/mysqltest.result:
  SCCS merged

client/mysqltest.c:
  - Remove the extra newline first in the file produced by
    write_file and append_file
  - Add check for too many arguments passed to 'check_command_args'
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Add test to check that no extra newline is created

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged

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


strings/ctype-extra.c:
  Auto merged

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


mysys/mf_iocache2.c:
  Auto merged

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


strings/ctype-extra.c:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

 - Run "SHOW WARNINGS" when mysqltest fails and display all but the
   last warning(since it's the same as "last error") on stderr
 - Fix typo


client/mysqltest.c:
  - Display any warnings produced prior to the error that caused
  mysqltest to die.
  - Fix typo "cur_con" -> "con_slot"
  - Move initialization of the "cur_con" pointer to just before it's
    initialized  so it can be used to check if a connection to mysql
    exist.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
client/mysqltest.c:
  Manual merge

 - Update comments
 - Make "write_file" fail if file already exist
 - Remove temporary files created by test cases


client/mysqltest.c:
  Improve function comments
  Make write_file fail if file already exist
mysql-test/r/mysqltest.result:
  Update test result after adding new test and updating description
  of argumements to chmod
mysql-test/t/bootstrap.test:
  Remove temporary file created by testcase
mysql-test/t/mysql.test:
  Remove temporary file created by testcase
mysql-test/t/mysqladmin.test:
  Remove temporary file created by testcase
mysql-test/t/mysqltest.test:
  Remove temporary file created by testcase 
  Add test to show that "write_file" fails if file already exist
mysql-test/t/sp-destruct.test:
  Remove temporary file created by testcase

Two character mappings were way off (backtick and tilde were "E"
and "Y"!), and three others were slightly rotated.  The first 
would cause collisions, and the latter was probably benign.

Now, assign the character mappings exactly to their normal values.


sql/share/charsets/ascii.xml:
  Change the character mapping for 
   "`" to "`" (was "E") and 
   "[" to "[" (was "\") and 
   "\" to "\" (was "]") and
   "]" to "]" (was "[") and 
   "~" to "~" (was "Y").
strings/ctype-extra.c:
  Generated from charsets directory.
mysql-test/r/ctype_ascii.result:
  Add new test file.
  
  Test all combinations of printable letter comparisons for 
  similarity.
mysql-test/t/ctype_ascii.test:
  Add new test file.
  
  Test all combinations of printable letter comparisons for 
  similarity.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


BitKeeper/deleted/.del-.del-README.txt:
  Auto merged
sql/item_func.cc:
  Auto merged

into  pilot.(none):/data/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

Extend buffer size to allow for longer log messages

Update comments
Add more tests for "let from query"


client/mysqltest.c:
  Remove NOT_YET code
  Update comments
mysql-test/r/mysqltest.result:
  Add more tests for "let from query"
mysql-test/t/mysqltest.test:
  Add more tests for "let from query"

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new


scripts/make_win_bin_dist:
  Auto merged

  Corrected install path


scripts/make_win_bin_dist:
  Corrected install path

  Copy embedded .pdb and static debug lib


scripts/make_win_bin_dist:
  Copy embedded .pdb and static debug lib

Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.

Now the *_init functions get the constant as a null terminated string with the correct
length supplied.


mysql-test/r/udf.result:
  Test case to check constants passed UDFs.
mysql-test/t/udf.test:
  Test case to check constants passed UDFs.
sql/item_func.cc:
  UDF _init functions are now passed the length of the constants, rather than the max
  length of the var containing the constant.
sql/udf_example.c:
  Added check_const_len functions. The check_const_len_init functions checks that the
  lengths of constants are correctly passed.

into  damien-katzs-computer.local:/Users/dkatz/mysql51


BitKeeper/deleted/.del-.del-README.txt:
  Delete: BitKeeper/deleted/.del-README.txt

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new


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

  Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree


mysql-test/mysql-test-run.pl:
  Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree