into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198

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  mysql.com:/export/space/pekka/ndb/version/my51

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


sql-common/client.c:
  Auto merged

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


BitKeeper/deleted/.del-wait_slave_status.inc:
  Delete: mysql-test/include/wait_slave_status.inc
sql-common/client.c:
  Auto merged

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

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


sql-common/client.c:
  Auto merged

  Fixing wrong min_sort_char.


strings/ctype-czech.c:
  Fixing wrong min_sort_char.

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

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/parse_file.cc:
  Auto merged

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

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

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


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged

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


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged

storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/ndbapi/NdbBlob.cpp:
  atNextEvent: ignore non-data event
sql/ha_ndbcluster_binlog.cc:
  schema.query => blob
storage/ndb/tools/restore/Restore.cpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/Restore.hpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/restore_main.cpp:
  allow 'system tables' to have blob attrs

5.0.18 by not reseting or accessing the info_buffer member

sql/parse_file.cc:
  Remove unused variable

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.0

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