into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/r/ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged

mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304

mysql-test/r/ndb_basic.result:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
mysql-test/t/ndb_alter_table.test:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
sql/ha_ndbcluster.cc:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
sql/ha_ndbcluster.h:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex

storage/ndb/src/ndbapi/ndberror.c:
  delete non-sense error 4336
storage/ndb/include/ndbapi/Ndb.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/Ndb.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges

  After merge fix


sql/sql_select.cc:
  After merge fix

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/partition_info.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/share/errmsg.txt:
  manual merge

Review fix


sql/partition_info.cc:
  Review fix

mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1

into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1

into  mysql.com:/usr/local/mysql/mysql-5.1-new

into  zim.(none):/home/brian/mysql/dep-5.1

of hostname in query results.


mysql-test/r/events_logs_tests.result:
  Update results
mysql-test/t/events_logs_tests.test:
  Replace user_host in results, since it is system dependent.

into  zim.(none):/home/brian/mysql/dep-5.1

BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Delete: scripts/mysql_explain_log.sh
scripts/Makefile.am:
  Removing mysql_explain_log
scripts/make_binary_distribution.sh:
  Removing mysql_explain_log
support-files/mysql.spec.sh:
  Remove reference to mysql_explain_log

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  zim.(none):/home/brian/mysql/dep-5.1


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/log_tables.result:
  Merge conflict
mysql-test/t/log_tables.test:
  Merge conflict

  Rename load_event() to load_named_event(), to avoid name clash on HP-UX


sql/event_scheduler.cc:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
sql/event_scheduler.h:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX

Fixed core dump in --help


include/heap.h:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
mysys/my_getopt.c:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
sql/mysqld.cc:
  Wrong type.

into lmy004.:/work/mysql-5.1-release

make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)


sql/event_scheduler.cc:
  __FUNCTION__ is not available everywhere.
  make us see at least with gcc the function proto. this can be extended
  probably for windows too.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release

into lmy004.:/work/mysql-5.1-release-17619-try3

mysql-test/r/log_tables.result:
  update result so test is less fragile
mysql-test/t/log_tables.test:
  update test so it is less fragile

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release

into lmy004.:/work/mysql-5.1-release-17619-try3

mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/ha_partition.cc:
  Fixed error handling

mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/partition_info.cc:
  Check for not merge handler in partitioned table
sql/share/errmsg.txt:
  New error message

mysql-test/r/not_embedded_server.result:
  update result
mysql-test/r/sp-threads.result:
  update result
sql/event_scheduler.h:
  fix build error with SUN compiler
sql/mysqld.cc:
  fix problem with --init-file which was expecting to be the only running
  thread. nevertheless Events should be started as close as possible to the
  place connections are handled.

into lmy004.:/work/mysql-5.1-release-17619-try3

drop users at the end of events_stress


mysql-test/r/ps_1general.result:
  update result
mysql-test/r/skip_name_resolve.result:
  update result
mysql-test/r/sp_notembedded.result:
  update result
mysql-test/r/status.result:
  update result
mysql-test/t/events_stress.test:
  drop users created in the test