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


sql/ha_berkeley.cc:
  Auto merged

Restore "make dist" for the header files in "storage/innobase/include".


storage/innobase/Makefile.am:
  A recent change (coming from the "innobase" team, pushed by alexi) broke "make dist"
  which is needed for release builds (deletion of "storage/innobase/include/Makefile.am").
  The effect was that files "storage/innobase/include/*.h" were missing in the source.tgz
  
  Restore "make dist" without fully reverting the change by listing the files in a (new)
  "EXTRA_DIST" target in the parent level directory.

into mysql.com:/home/hf/work/mysql-5.1.clean

into mysql.com:/home/hf/work/mysql-5.1.clean

mysql-test/r/partition_list.result:
  test result fixed
mysql-test/r/partition_range.result:
  test result fixed
mysql-test/t/partition_list.test:
  test fixed
mysql-test/t/partition_range.test:
  test fixed

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/ndb_multi.result:
  merge
mysql-test/t/ndb_multi.test:
  merge
sql/ha_ndbcluster.cc:
  merge

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

into trift-lap.fambruehe:/MySQL/M51/work-5.1


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

into mysql.com:/home/hf/work/mysql-5.1.clean

include/my_base.h:
  HA_ERR_NO_PARTITION_FOUND added
mysql-test/r/partition_error.result:
  test result fixed
mysql-test/t/partition_error.test:
  test case added
sql/ha_partition.cc:
  now we launch the informative error message here
sql/share/errmsg.txt:
  Error message added

mysql-test/r/partition.result:
  result fixed
mysql-test/r/partition_mgm_err.result:
  result fixed
mysql-test/t/partition.test:
  test case added
mysql-test/t/partition_mgm_err.test:
  test modified to produce the declared error
sql/handler.h:
  check_reorganise_list interface
sql/sql_partition.cc:
  check_reorganise_list implementation
sql/sql_table.cc:
  now we call check_reorganise_list to do proper test.
  Also we should set right no_parts value as it can change here

into trift-lap.fambruehe:/MySQL/M51/merge-5.1


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

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


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

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

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

  - libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options

  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

into  mysql.com:/home/novo/MySQL/mysql-5.1


support-files/mysql.spec.sh:
  Auto merged

into trift-lap.fambruehe:/MySQL/M51/merge-5.1


sql/sp_head.cc:
  Auto merged
sql/table.cc:
  Auto merged

into trift-lap.fambruehe:/MySQL/M51/merge-5.1


mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

and bug #15668: Test 'sp-error' crashes server on Mac OS X.


mysql-test/r/rpl000001.result:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/flush_read_lock_kill.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl000001.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl_error_ignored_table.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
sql/sql_class.cc:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - don't call the close_active_vio() in case of KILL_QUERY.

into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

  incorrect handling of varchar in position/rnd_pos

  Commit for 5.0.17 release clone


mysql-test/r/ndb_basic.result:
  bug#15682
mysql-test/t/ndb_basic.test:
  bug#15682
sql/ha_ndbcluster.cc:
  bug#15682

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge

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


storage/bdb/dist/gen_rec.awk:
  Auto merged

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

bdb/dist/gen_rec.awk:
  Fix undefined behaviour.

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

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge

into  hundin.mysql.fi:/home/jani/mysql-5.1-new


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

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


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

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge

mysql-test/r/ndb_basic.result:
  bug#15682 - invalid handling of varchar in position/rnd_pos
mysql-test/t/ndb_basic.test:
  bug#15682 - invalid handling of varchar in position/rnd_pos
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New error code for invalid key
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle invalid key gracefully
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Handle invalid key gracefully
ndb/src/ndbapi/ndberror.c:
  New error code
sql/ha_ndbcluster.cc:
  Fix varchar keys in position/rnd_pos

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


extra/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Merged from 5.0
sql/handler.cc:
  Merged from 5.0
sql/mysqld.cc:
  Merged from 5.0

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0