New methods to handle VARCHAR strings and CHAR's which are not
using a binary collation.
Indentation fixes
Now strings are run through strnxfrm before they are processed
by the partition function
We do not allow collations where strnxfrm expands the string since
we want the resulting string to fit in the same value range as
the original.


mysql-test/r/partition_range.result:
  New test cases
mysql-test/t/partition_range.test:
  New test cases
sql/partition_info.h:
  New methods to handle VARCHAR strings and CHAR's which are not
  using a binary collation.
sql/sql_partition.cc:
  New methods to handle VARCHAR strings and CHAR's which are not
  using a binary collation.
  Indentation fixes
  Now strings are run through strnxfrm before they are processed
  by the partition function
  We do not allow collations where strnxfrm expands the string since
  we want the resulting string to fit in the same value range as
  the original.

mysql-test/r/partition.result:
  Removed test case no longer supported
mysql-test/r/partition_error.result:
  Changed behaviour of test case
mysql-test/r/partition_pruning.result:
  Changed behaviour of test case
mysql-test/t/partition.test:
  Changed behaviour of test case
mysql-test/t/partition_error.test:
  Changed behaviour of test case
mysql-test/t/partition_pruning.test:
  Changed behaviour of test case
sql/sql_partition.cc:
  Ensured PARTITION BY KEY can use any column type

into  dator5.(none):/home/pappa/bug18198


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/r/date_formats.result:
  Fix results after merge
mysql-test/r/mysqldump.result:
  Fix results after merge
mysql-test/t/disabled.def:
  Add randomly-failing test with open bug
mysql-test/t/mysqldump.test:
  Clean up test after merge and fix 'End of test' markers

into  rama.(none):/home/jimw/my/mysql-5.1-clean


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/embedded_priv.h:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/time.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
  Delete: mysql-test/include/have_case_sensitive_file_system.inc
BitKeeper/deleted/.del-case_sensitive_file_system.require:
  Delete: mysql-test/r/case_sensitive_file_system.require
mysql-test/lib/mtr_cases.pl:
  Resolve conflict
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/r/mysqldump.result:
  Resolve conflict
mysql-test/t/mysqldump.test:
  Resolve conflict
sql/sql_parse.cc:
  Resolve conflict

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


mysql-test/r/create_not_windows.result:
  Auto merged
sql/sql_base.cc:
  Auto merged

storage/myisam/mi_create.c:
  Post-merge fixes (Thanks Ingo).

 - Add loop in mysqlslap that tries to connect up to 10 times if connect
   in thread fails.


client/mysqlslap.c:
  Add loop to retry connect 10 times with a small sleep in between.
mysql-test/t/disabled.def:
  Remove disabling of testcase

mysql-test/t/ndb_autodiscover3.test:
  Increase time to sleep and add explanation why

 - Disable 3 test cases that crashes slave


mysql-test/t/disabled.def:
  Disable test cases where slave crashes due to bug#21298

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


mysql-test/t/disabled.def:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  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/ndbapi/ndberror.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/federated.result:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
storage/myisam/mi_create.c:
  Manual merge.

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#14935 - post-review
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  bug#14935 - post-review
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#14935 - post-review

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/sql_table.cc:
  Auto merged

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

mysql-test/r/sp.result:
  Exclude
mysql-test/t/sp.test:
  Exclude

 - Add prelocking for stored procedures that uses sp or sf
 - Update test result for sp_error(reported as bug#21294)
 - Make note about new error message from sp-error(bug#17244)


mysql-test/r/sp-error.result:
  Update test result(reported as bug#21294)
mysql-test/r/sp_notembedded.result:
  Update test result after disabling test case
mysql-test/t/sp-error.test:
  Add note about the faulty error message
mysql-test/t/sp_notembedded.test:
  Disable test case until bug#17244 has been fixed
sql/sp.cc:
  Add prelocking for all stored procedures that uses another sp or sf
sql/sp.h:
  Add prelocking for all stored procedures that uses another sp or sf
sql/sql_base.cc:
  Add prelocking for all stored procedures that uses another sp or sf

mysql-test/mysql-test-run.pl:
  Report warining when failure to start mysqld was detected, this will allow the testcase to continue executing.
  The failure to start mysqld will be caugt when executing mysqltest

mysql-test/mysql-test-run.pl:
  Fix problem with checking that all im processes has shutdown cleanly
  When it was detected that one of "im mysqlds" didn't shutdown, last was called to break the loop, but it only broke the inner loop.
  Remove the while(0) loop and make this easier by setting $clean_shutdown to 0 if any such problem is detected.

Emit an error instead of doing ASSERT


mysql-test/r/create_not_windows.result:
  update result
mysql-test/t/create_not_windows.test:
  Add test case for bug #16532: mysql server assert in debug if table definition is removed
sql/sql_table.cc:
  it could happen that an user deletes the frm file on OS level.
  In addition if the table was already opened, the file system level
  check for existance of table.frm will pass but get_cached_table_share()
  will return non-NULL value. In this case we will emit the standard
  error that the table exist. The error case is quite obscure but error
  message is better than a sigabort.

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-amerge


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
configure.in:
  Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/handler.h:
  Manual merge
storage/blackhole/ha_blackhole.cc:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge

(well, im_options in this case, but using existing bug report)


mysql-test/t/disabled.def:
  disable im_options test as it's non-deterministic. reopen bug

into  willster.(none):/home/stewart/Documents/MySQL/5.1/main


BitKeeper/etc/config:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/Makefile.am:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  manual merge

Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error


mysql-test/r/ndb_dd_backuprestore.result:
  Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error
mysql-test/r/ndb_partition_range.result:
  Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

Test case fix


mysql-test/r/information_schema_part.result:
  Test case fix

into  dator5.(none):/home/pappa/bug20733


sql/sql_show.cc:
  Auto merged

into  dator5.(none):/home/pappa/bug20733