into  mysql.com:/usr/home/bar/mysql-5.1-new

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.


BUILD/compile-amd64-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-amd64-debug-max:
  Remove a no-op.
BUILD/compile-darwin-mwcc:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-pentium-debug-max:
  Remove a no-op.
BUILD/compile-pentium-debug-openssl:
  Remove a no-op.
BUILD/compile-pentium-debug-yassl:
  Remove a no-op.
BUILD/compile-pentium-debug:
  Remove a no-op.
BUILD/compile-pentium-mysqlfs-debug:
  Remove a no-op.
BUILD/compile-pentium-valgrind-max:
  Remove a no-op.
BUILD/compile-pentium64-debug-max:
  Remove a no-op.
BUILD/compile-pentium64-debug:
  Remove a no-op.
BUILD/compile-pentium64-valgrind-max:
  Remove a no-op.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-ppc-debug-max:
  Remove a no-op.
BUILD/compile-ppc-debug:
  Remove a no-op.

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/home/bk/b18436-mysql-5.1-new

BUILD/SETUP.sh:
  Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-amd64-debug-max:
  Remove dead options.
BUILD/compile-amd64-max:
  Remove dead options.
BUILD/compile-darwin-mwcc:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-pentium-debug-max:
  Remove dead options.
BUILD/compile-pentium-icc-valgrind-max:
  Remove dead options.
BUILD/compile-pentium-max:
  Remove dead options.
BUILD/compile-pentium-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max:
  Remove dead options.
BUILD/compile-pentium64-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-ppc-debug-max:
  Remove dead options.
BUILD/compile-ppc-max:
  Remove dead options.

  After merge correction


libmysqld/Makefile.am:
  After merge correction

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged

into  mysql.com:/home/bk/b18436-mysql-5.1-new

VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged

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

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/home/timka/mysql/src/5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre

into  mysql.com:/usr/home/bar/mysql-5.0

mysql-test/r/information_schema.result:
  IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
  IS_COMPILED is not determenistic
strings/conf_to_src.c:
  Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
  Recreating sources according to 5.0 XML files using conf_to_src.

into  rurik.mysql.com:/home/igor/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into  rurik.mysql.com:/home/igor/mysql-5.0


sql/item.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18659
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18659

- move slock bitmask to separate hash list, object living only during query


sql/ha_ndbcluster.h:
  Bug #18596 binlog schema event auto push causes mysqld errors

netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/usr/home/bar/mysql-5.0


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-extra.c:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-4.1.12076

config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new