mysql-test/r/partition_error.result:
  Fixed result files after rearranging code a bit
mysql-test/t/partition_error.test:
  Fixed result files after rearranging code a bit
sql/share/errmsg.txt:
  Fixed result files after rearranging code a bit
sql/sql_yacc.yy:
  Added initialisation

sql/sql_yacc.yy:
  Fix mistake

sql/handler.h:
  Fixed so that I store list of longlong's for list and
  a longlong value for range end instead of an item tree
  reference.
sql/sql_partition.cc:
  Fixed so that I store list of longlong's for list and
  a longlong value for range end instead of an item tree
  reference.
sql/sql_yacc.yy:
  Fixed so that I store list of longlong's for list and
  a longlong value for range end instead of an item tree
  reference.

into  mysql.com:/Users/mikron/mysql-5.1

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Set up node group information as default if no node group info is
  passed in create table message.

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


scripts/Makefile.am:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged

for this as well


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fixed guess of proper transaction coordinator for NDB API users
storage/ndb/test/ndbapi/testPartitioning.cpp:
  Test case for both hash and linear hash

into mysql.com:/home/gluh/MySQL/Merge/5.0


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

into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1.b11216

into deer.(none):/home/hf/work/mysql-5.0.10839

into  mysql.com:/home/jonas/src/mysql-4.1-push

  removing extra empty line
  ,


strings/ctype-latin1.c:
  removing extra empty line
  ,

Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.



strings/ctype-latin1.c:
  Bug#11216: 'show character set' describes latin1 incorrectly
  Fixed to- and from-Unicode conversion maps.
mysql-test/r/ctype_latin1.result:
  changeing test results accordingly.
sql/share/charsets/Index.xml:
  Fixing comment: iso-8859-1 -> cp1252

into deer.(none):/home/hf/work/mysql-5.0.10839

into mysql.com:/space/my/mysql-4.1

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged

into mysql.com:/space/my/mysql-5.0

into deer.(none):/home/hf/work/mysql-5.0.10839


myisam/mi_create.c:
  Auto merged

into  mysql.com:/home/jonas/src/mysql-4.1-push

into mysql.com:/space/my/mysql-5.0

into  mysql.com:/home/jonas/src/mysql-5.0-push

into  mysql.com:/home/jonas/src/mysql-5.0-push


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

into  mysql.com:/home/jonas/src/mysql-5.0


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

into  mysql.com:/home/jonas/src/mysql-4.1-push

  fix bug introduced in alter table

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

into mysql.com:/space/my/mysql-4.1

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


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged

  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.


strings/ctype-cp932.c:
  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.

into  mysql.com:/home/jonas/src/mysql-4.1-push

into  mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/home/jonas/src/mysql-5.0-push

into mysql.com:/space/my/mysql-4.1-build

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged