Added missing #ifdef for partitioning

Added new syntax for partition management


mysql-test/t/partition_error.test:
  New line
sql/ha_partition.cc:
  Added support for DROP PARTITION on-line
sql/ha_partition.h:
  Added support for DROP PARTITION on-line
sql/handler.h:
  Introduced state of partition
  Introduced extra list of temporary partitions
  Removed no_full_parts
  A couple of methods to check for duplicate names of partitions
  Adaptions of default checks to be useful from ALTER TABLE
  partition management
  New method on handler to drop partitions
  New method to check for foreign keys on table
sql/lex.h:
  COALESCE and REORGANISE used by ALTER TABLE x COALESCE/REORGANISE PARTITION
sql/mysql_priv.h:
  Parser needs method to check if partition management command is ongoing
sql/share/errmsg.txt:
  A number of new error messages for partition management
sql/sql_lex.h:
  Adapted the ALTER_INFO data structure for partition management
sql/sql_partition.cc:
  Couple of new routines + adaption of existing for new
  partition management functionality
sql/sql_table.cc:
  bin log writing into separate subroutine to minimise code
  duplication.
  Lots of new code to handle partition management
sql/sql_yacc.yy:
  New syntax for partition management
  Fixed a few errors in the parser part for partitioning

  corrected compile error


sql/ha_innodb.h:
  corrected compile error
sql/ha_ndbcluster.h:
  corrected compile error

storage/ndb/tools/ndb_condig.cpp:
  Auto merged
configure.in:
  No version change in merge.
storage/ndb/tools/Makefile.am:
  No filename change in merge.

mysql-test/t/ndb_partition_key.test:
  Fixed constant error codes, replaced with name of constant
mysql-test/t/partition_error.test:
  Fixed constant error codes, replaced with name of constant

storage/ndb/tools/ndb_condig.cpp:
  Rename: ndb/tools/config.cpp -> storage/ndb/tools/ndb_condig.cpp
storage/ndb/tools/Makefile.am:
  Rename due to mixed names with no case sensitivity

into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/etc/config:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/default.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/read0types.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0sys.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Manual merge 5.0 -> 5.1
mysql-test/t/alter_table.test:
  Manual merge 5.0 -> 5.1
sql/share/errmsg.txt:
  Manual merge 5.0 -> 5.1
storage/ndb/tools/Makefile.am:
  Manual merge 5.0 -> 5.1

into mysql.com:/M50/clone-5.0

Rename "port.h" to "portability.h" to avoid conflict with system header file name,
and include the file in "Makefile.am".


server-tools/instance-manager/Makefile.am:
  Ensure that the (recently added) header "portability.h" (renamed from "port.h") gets included in the source packages.
server-tools/instance-manager/guardian.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/instance.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/instance_options.h:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/listener.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/log.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/mysqlmanager.vcproj:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/options.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/parse_output.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/portability.h:
  Adapt the protective CPP symbol to the changed file name.
server-tools/instance-manager/priv.cc:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.
server-tools/instance-manager/priv.h:
  Rename "port.h" to "portability.h" to avoid conflict with system header file name.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


client/client_priv.h:
  Auto merged

  Removed ending comma in enum
Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp


ndb/tools/ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
ndb/tools/Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
client/client_priv.h:
  Removed ending comma in enum

mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis.test:
  testcase added

into deer.(none):/home/hf/work/mysql-5.0.12281

Field_geom lack size_of method


sql/field.h:
  size_of implemented

server-tools/instance-manager/listener.cc:
  some more cleanup

server-tools/instance-manager/WindowsService.cpp:
  Change mode to -rw-rw-r--
server-tools/instance-manager/WindowsService.h:
  Change mode to -rw-rw-r--
server-tools/instance-manager/port.h:
  Change mode to -rw-rw-r--
server-tools/instance-manager/mysqlmanager.vcproj:
  Change mode to -rw-rw-r--
server-tools/instance-manager/IMService.cpp:
  Change mode to -rw-rw-r--
server-tools/instance-manager/IMService.h:
  Change mode to -rw-rw-r--

server-tools/instance-manager/IMService.cpp:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
  cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
  coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
  simplify password file processing

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/commands.cc:
  fix memory leak
server-tools/instance-manager/guardian.cc:
  don't check pthread_mutex_lock/unlock return value, as it never returns error if properly
  used (no self deadlocks) and initialized
server-tools/instance-manager/guardian.h:
  prototype fixed
server-tools/instance-manager/instance_map.cc:
  don't check pthread_mutex_lock/unlock status, as it never returns error if
  properly used (no self deadlocks) and initialized
server-tools/instance-manager/instance_map.h:
  prototype fixed
server-tools/instance-manager/listener.cc:
  initialize highest-numbered descriptor to 0 for select before setting it with max(n, sockets[i]),
  ifdef unix-specific code
server-tools/instance-manager/manager.cc:
  remove commented stuff
server-tools/instance-manager/options.cc:
  fix crash in load_defaults, which happened on all Unix systems due to
  const char *Options::config_file= NULL. Check return value for GetModuleFileName.
  Get rid of obscure default_config_file[FN_REFLEN]= "/etc/my.cnf"; which was never used

mysql-test/r/information_schema.result:
  fix the test case for fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
mysql-test/r/information_schema_db.result:
  fix the test case for fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
sql/sql_show.cc:
  reorder the structure
  fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
sql/table.h:
  reorder the enum
  fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames

client/client_priv.h:
  Fix a compile failure.

mysql-test/r/view.result:
  Update results file

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

mysql-test/r/create.result:
  Update error message text
mysql-test/r/query_cache.result:
  Update warnings

sql/item_sum.cc:
  Auto merged
mysql-test/r/view.result:
  Manual merge
mysql-test/t/view.test:
  Manual megre
sql/sql_select.cc:
  Manual merge

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


BitKeeper/deleted/.del-not_windows.inc:
  Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/query_cache.result:
  Resolve conflict

mysql-test/r/query_cache.result:
  Updated results
mysql-test/t/query_cache.test:
  Change test to use a truly invalid date, now that dates like 
  '20050327 0:0:0' are handled as they are in 4.0.

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

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

into  fedora.(none):/home/reggie/bk/im_patch

into  fedora.(none):/home/reggie/bk/im_patch

into  fedora.(none):/home/reggie/bk/im_patch


server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
server-tools/instance-manager/commands.cc:
  final merge of IM port code for Windows
server-tools/instance-manager/instance_map.cc:
  final merge of IM port code for Windows
server-tools/instance-manager/options.cc:
  final merge of IM port code for Windows

into mysql.com:/space/my/mysql-5.0

into deer.(none):/home/hf/work/mysql-5.0.clean

into deer.(none):/home/hf/work/mysql-4.1.clean

mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged