into  mysql.com:/home/hf/work/embt/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/flush_block_commit.result:
  SCCS merged

into  mysql.com:/home/hf/work/pfix/my51-pfix


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged

mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  path to datafile fixed

into  mysql.com:/home/hf/work/22372/my51-22372


mysql-test/t/gis.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/gis.result:
  SCCS merged
sql/field.h:
  merging

mysql-test/r/gis.result:
  result fixed
sql/field.cc:
  Field_*::reset() now returns int
sql/sql_load.cc:
  merging fix

into  mysql.com:/home/hf/work/22372/my50-22372


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
sql/field.cc:
  merging
sql/field.h:
  merging
sql/sql_load.cc:
  merging

datafile added to be used in gis.test


mysql-test/std_data/bad_gis_data.dat:
  New BitKeeper file ``mysql-test/std_data/bad_gis_data.dat''

The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()


mysql-test/r/gis.result:
  test result
mysql-test/t/gis.test:
  testcase
sql/field.cc:
  reset() now returns error sign
sql/field.h:
  Field_*::reset() now returns error sign if the field can't be reset
sql/sql_load.cc:
  check if field can't be reset and return error if it's so

into  mysql.com:/home/hf/work/mysql-5.1.20835

into  mysql.com:/home/hf/work/mysql-5.1.20835


mysql-test/t/subselect.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

into  mysql.com:/home/hf/work/22634/my51-22634


storage/archive/ha_archive.cc:
  Auto merged

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1


mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/item_func.cc:
  Auto merged

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0


sql/item_func.cc:
  Auto merged

into  mysql.com:/home/hf/work/22634/my51-22634


storage/archive/ha_archive.cc:
  Auto merged

  fixed a valgrind problem


mysql-test/r/type_varchar.result:
  fixed a valgrind problem

   fixed a valgrind warning
type_varchar.test:
  fixed a valgrind warning


mysql-test/t/type_varchar.test:
  fixed a valgrind warning
sql/item_func.cc:
   fixed a valgrind warning

We create Item_cache_* object for each operand for each left operand of
a subquery predicate. We also create Item_func_conv_charset for each string
constant that needs charset conversion. So here we have Item_cache wrapped
into Item_func_conv_charset.
When Item_func_conv_charset wraps an constant Item it gets it's value
in constructor. The problem is that Item_cache is ready to be used only
at execution time, which is too late.
The fix makes Item_cache wrapping constant to get ready at fix_fields() time.


mysql-test/r/subselect.result:
  test result
mysql-test/t/subselect.test:
  test case
sql/item_cmpfunc.cc:
  now Item_optimizer::fix_left will store constant arguments in cache
  on fix_fields() stage

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/table.cc:
  Auto merged

  Disabled abi_check, as it was before merge


include/Makefile.am:
  Disabled abi_check, as it was before merge

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


Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)


scripts/mysql_install_db.sh:
  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
include/Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)

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

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

  Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def


netware/mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
netware/Makefile.am:
  Added "mysql_client_test.def"

  Adjusted for storage path
nwbootstrap:
  Corrected bad merge


netware/BUILD/nwbootstrap:
  Corrected bad merge
netware/myisam_ftdump.def:
  Adjusted for storage path
netware/myisamchk.def:
  Adjusted for storage path
netware/myisamlog.def:
  Adjusted for storage path
netware/myisampack.def:
  Adjusted for storage path

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

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

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


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

  Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)


netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_upgrade.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def
netware/Makefile.am:
  Added "mysql_upgrade.def"

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema

include/m_ctype.h:
  update prototype to reflect changes to my_strchr.c

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

  Handle events "differently" so that dict doesnt get lock too often


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Handle event separatly as they dont set block_state :-(

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

  This prevent any subsequent node restarts, but it's better than crashing an alive node


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix for bug#24752
  This prevent any subsequent node restarts, but it's better than crashing an alive node

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


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged