Moved some code to else path to avoid delete, create, delete, create scenarios.
Fixed up the partition info object for some cases where we move from default
partitioning in NDB to default partitioning using partitioning.


sql/sql_partition.cc:
  Added a new parameter for partition default handling
  This is to avoid calling get_no_parts on tables not yet
  created.
  Ensure that we don't reuse the old part_info object for
  any other operation than CREATE TABLE after reading up
  the frm file.
sql/sql_table.cc:
  Moved some code to else path to avoid delete, create, delete, create scenarios.
  Fixed up the partition info object for some cases where we move from default
  partitioning in NDB to default partitioning using partitioning.

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

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

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

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

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

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


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged

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


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

ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

 - Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
 - This has been done before


mysql-test/r/fulltext.result:
  Use FORMAT to only output the first 6 decimals from MATCH
mysql-test/t/fulltext.test:
  Use FORMAT to only output the first 6 decimals from MATCH

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


sql/table.cc:
  Auto merged

mysql-test/include/have_udf.inc:
  Add comment that a check for udf_example.so must be made
mysql-test/t/disabled.def:
  Disable udf.test

ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

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

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

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

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


sql/table.cc:
  Auto merged

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

  After review fix.
  Thanks to Gluh for suggestion.
  Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error


sql/item_xmlfunc.cc:
  After review fix.
  Thanks to Gluh for suggestion.
  Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error

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

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

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


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Moving statement-based replication test away from common file.
mysql-test/r/ctype_cp932_binlog_stm.result:
  Result change
mysql-test/t/ctype_cp932_binlog_stm.test:
  Moving statement-based replication test away from common file.

    (approved by kostja)


libmysql/libmysql.c:
  fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) 
  (approved by kostja)

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


sql/item.cc:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Merge with mysql-5.0

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

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


sql/mysqld.cc:
  Auto merged

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


configure.in:
  Auto merged

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

This to save 5 seconds of test time.
More test to follow. :-)


mysql-test/r/rpl_flushlog_loop.result:
  Updated result file
mysql-test/t/rpl_flushlog_loop.test:
  Make test use wait_slave_status instead of sleep

into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310