mysql-test/t/ctype_ucs.test:
  Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

into  phoenix.(none):/data/mysql-4.1-BK

into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1

Fixed that UPDATE statement crashes multi-byte charset fulltext index.


myisam/ft_update.c:
  Fixed that UPDATE statement crashes multi-byte charset fulltext index.
  While updating, always rewrite multi-byte charset fulltext index.
mysql-test/r/fulltext2.result:
  Added a testcase for BUG#16489.
mysql-test/t/fulltext2.test:
  Added a testcase for BUG#16489.

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

into  phoenix.(none):/data/mysql-4.1-BK

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg


sql/item_func.cc:
  Auto merged

mysql-test/ndb/ndbcluster.sh:
  have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

mysql-test/ndb/ndbcluster.sh:
  small fix to make ndb_mgmd run
ndb/tools/ndb_size.pl:
  small typo

 mysql_stmt_prepare returns wrong field length"


sql/protocol.cc:
  A fix for Bug#15613: make sure that result set column length
  is evaluated correctly for BLOB/TEXT columns.
tests/mysql_client_test.c:
  A test case for Bug#15613

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


sql/sql_select.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11331

into  devsrv-b.mysql.com:/space/magnus/my41-bug14634

use the right type in mysql_stmt_attr_get


libmysql/libmysql.c:
  Fix Bug#16144 "mysql_stmt_attr_get type error"
tests/mysql_client_test.c:
  A test case for Bug#16144

into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1


configure.in:
  Auto merged

into  devsrv-b.mysql.com:/space/magnus/my41-bug14634


sql/sql_select.cc:
  Auto merged

sql/sql_select.cc:
  Backport from 5.0, catch the new errno that is returned

libmysqlclient versioning when linked with GNU ld.


BitKeeper/etc/ignore:
  Added libmysql/libmysql.ver to the ignore list
configure.in:
  libmysqlclient versioning when linked with GNU ld.
libmysql/Makefile.shared:
  libmysqlclient versioning when linked with GNU ld.
libmysql/libmysql.ver.in:
  New BitKeeper file ``libmysql/libmysql.ver.in''

into mysql.com:/M41/mysql-4.1

into  mysql.com:/opt/local/work/mysql-4.1-root

mysql-test/r/ctype_ucs.result:
  Test results changed (Bug#13337)
mysql-test/r/ps.result:
  Test results changed (Bug#13337)
mysql-test/t/ctype_ucs.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)
mysql-test/t/ps.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)

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

mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  SCCS merged

  fix for bug #15828 after review
  doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values


mysql-test/t/date_formats.test:
  fix for bug #15828 after review
  doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values

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

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

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


sql/ha_berkeley.cc:
  Merge 4.0 -> 4.1, change is already in 4.1

   - Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.

into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14

 Fixed BUG#14056: Column prefix index on UTF-8 primary key
 causes "Can't find record.."
 Also fixed bug 15991.


innobase/include/os0file.h:
  Changes from innodb-4.1-ss14 snapshot
   os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
   to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
   This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
   link to a different file system. (Bug 15991)
innobase/os/os0file.c:
  Changes from innodb-4.1-ss14 snapshot
   os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
   to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
   This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
   link to a different file system. (Bug 15991)
mysql-test/r/innodb.result:
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."
mysql-test/t/innodb.test:
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."
sql/ha_innodb.cc:
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."

  fix for bug #15828 after review


sql/item_timefunc.cc:
  fix for bug #15828 after review

  fix for bug#15828 after review


sql/item_timefunc.cc:
  fix for bug#15828 after review

return incorrect result set for a select SQL request"


mysql-test/r/ps.result:
  Test results fixed (Bug#12734)
mysql-test/t/ps.test:
  A test case for Bug#12734
sql/item_cmpfunc.cc:
  Reset canDoTurboBM in Item_func_like::cleanup()
sql/item_cmpfunc.h:
  Add Item_func_like::cleanup()

extra/comp_err.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged