into  amd64.(none):/src/bug24732/my51-bug24732


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged

- Sign executables with MySQL AB security certificate.


BitKeeper/etc/ignore:
  Bug#24732 Executables do not include Vista manifests
  - Ignore security catalog descriptions
CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Search for additional tools necessary to embed, catalog and sign
  targets.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Add internal only note to EMBED_MANIFESTS option.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Added publicKeyToken attribute to manifest.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Add additional commands to create security catalog and sign 
  targets.
  - Add parameters to add appropiate hash attribute to manifest
  and create security content description of the security catalog.

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


sql/sql_table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Use local (manual merge)

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


mysql-test/r/innodb_mysql.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge

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


sql/sql_table.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql

into  trift-lap.none:/MySQL/M51/push-5.1

into  trift-lap.none:/MySQL/M50/push-5.0

into  trift-lap.none:/MySQL/M51/push-5.1

into  mysql.com:/home/ram/work/b28125/b28125.5.0


mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/r/innodb_mysql.result:
  manual merge.

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


libmysql/libmysql.c:
  SCCS merged
sql/field.cc:
  SCCS merged
sql/field.h:
  SCCS merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  SCCS merged
configure.in:
  SCCS merged
scripts/make_binary_distribution.sh:
  SCCS merged

into  mysql.com:/home/ram/work/b28125/b28125.5.1

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


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  mysql.com:/home/ram/work/b29923/b29923.5.1


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged

Result adjusted.


mysql-test/r/federated.result:
  Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint
    - result adjusted.

into  mysql.com:/home/ram/work/b28125/b28125.5.1


sql/sql_table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  manual merge

into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/t/disabled.def:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  SCCS merged
tests/mysql_client_test.c:
  SCCS merged

into  gleb.loc:/home/uchum/work/bk/5.0-opt


sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

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


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

CMakeLists.txt:
  BUG#20815 Set stack size. This value is really supposed to be the linker's default. I'm not quite sure why we have to specify it manually too.

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

The Item_date_typecast::val_int function doesn't reset null_value flag.
This makes all values that follows the first null value to be treated as nulls
and led to a wrong result.

Now the Item_date_typecast::val_int function correctly sets the null_value flag
for both null and non-null values.


mysql-test/t/cast.test:
  Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
  the null_value flag.
mysql-test/r/cast.result:
  Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
  the null_value flag.
sql/item_timefunc.cc:
  Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
  Now the Item_date_typecast::val_int function correctly sets the null_value flag
  for both null and non-null values.

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


mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
mysql-test/r/federated.result:
  manual merge

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


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  manual merge

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


mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.h:
  Auto merged
mysql-test/r/federated.result:
  Manual merge.

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

mysql-test/t/status.test:
  Fixed test to correctly wait for right server process and state.

tests/mysql_client_test.c:
  rc assignement added

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1


sql/mysql_priv.h:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0