including a small change to build_table_filename().


mysql-test/mysql-test-run.pl:
  Remove unused bad merge bitrot code.  This chunk of code is a repeat
  copy of an earlier chunk, and should never have been here.
mysql-test/r/innodb.result:
  Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/r/binlog_innodb.result:
  Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/t/binlog_innodb.test:
  Updates to allow innodb.test to be run with --embedded-server
mysql-test/t/innodb.test:
  Updates to allow innodb.test to be run with --embedded-server
sql/sql_table.cc:
  build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
  it's already there.  This is done to make it easier to write tests
  which check the output of various error messages, and work with
  both the embedded server (mysql_data_home is full path, including
  trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").

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


strings/ctype-extra.c:
  Auto merged

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

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

 - 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.

mysql-test/r/log_state.result:
  Update results (Bug#28830)
mysql-test/t/log_state.test:
  A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due 
  to loaded system - make the test more deterministic.

during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.


sql/table.cc:
  Apply patch for Bug#27806 table comments not passed in to storage engine 
  during "CREATE ... LIKE ..."

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


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

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item.cc:
  Auto merged

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


strings/ctype-extra.c:
  Auto merged

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

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

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

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

VIEW".

mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.

The problem was in an incomplete implementation of 
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.


sql/item.cc:
  A fix for Bug#29306 -- properly initialize decimals in 
  Item_ident_for_show::make_field
tests/mysql_client_test.c:
  Add a test case forBug#29306. Fix warnings.

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build

when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.


mysql-test/r/lock_multi.result:
  Added test for bug #21281 "Pending write lock is incorrectly removed
  when its statement being KILLed".
mysql-test/t/lock_multi.test:
  Added test for bug #21281 "Pending write lock is incorrectly removed
  when its statement being KILLed".

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2


mysql-test/t/federated.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
mysql-test/r/federated.result:
  SCCS merged