modified:
  storage/connect/tabxml.h
pending merges:
  Alexander Barkov 2013-08-22 Fixing a compilation failure in ConnectSE ca...

modified:
  storage/connect/tabxml.h

pending merges:
  Michael Widenius 2013-08-21 Fixed compiler warnings
    Alexander Barkov 2013-08-16 A post-fix for MDEV-4871: Fixing a faili...
    Sergey Vojtovich 2013-08-15 MDEV-4897 - Assertion `share->tdc.prev =...
    Sergey Vojtovich 2013-08-15 MDEV-4864 - Merge tests for EXCHANGE PAR...
    Alexander Barkov 2013-08-15 An additional test for MDEV-4871 Tempora...
    Alexander Barkov 2013-08-15 MDEV-4871 Temporal literals do not accep...
    Sergei Golubchik 2013-08-15 fix tests that were relying on @@have_pa...

modified:
  storage/connect/tabutil.h

  an XML table with DOMDOC.

modified:
  storage/connect/domdoc.cpp

- Add the flag HA_MUST_USE_TABLE_CONDITION_PUSHDOWN.

modified:
  storage/connect/ha_connect.cc

- Update version number

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/xml.result

            failed in TABLE_SHARE* tdc_acquire_share(THD*, const char*,
            const char*, const char*, uint, uint, TABLE**)

Removed false assertions.

When multiple threads acquire the same previously unused share,
only one thread shall remove share from unused list (the one that
has was_unused == true). Other threads will ignore this step and
may continue even if share is not yet removed from unused list.

Added partition_exchange test.

Do not set HA_OPTION_PACK_RECORD for InnoDB specific row formats
(e.g. COMPACT, REDUNDANT). Adjusted mysql_compare_tables() accordingly.

sql/sql_partition_admin.cc:
  compilation failures w/o partitioning

  information function. This solve the problem of uninitialised zone
  that was detected by valgrind.

modified:
  storage/connect/myconn.cpp
  storage/connect/odbconn.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabwmi.cpp

Following variables do not require LOCK_open protection anymore:
- table_def_cache (renamed to tdc_hash) is protected by rw-lock
  LOCK_tdc_hash;
- table_def_shutdown_in_progress doesn't need LOCK_open protection;
- last_table_id use atomics;
- TABLE_SHARE::ref_count (renamed to TABLE_SHARE::tdc.ref_count)
  is protected by TABLE_SHARE::tdc.LOCK_table_share;
- TABLE_SHARE::next, ::prev (renamed to tdc.next and tdc.prev),
  oldest_unused_share, end_of_unused_share are protected by
  LOCK_unused_shares;
- TABLE_SHARE::m_flush_tickets (renamed to tdc.m_flush_tickets)
  is protected by TABLE_SHARE::tdc.LOCK_table_share;
- refresh_version (renamed to tdc_version) use atomics.

  when deleting one key of a INI table with layout=Row. The same happens
  for layout=column but this is normal as one line is one section.

modified:
  storage/connect/tabsys.cpp

- Should fix a valgrind warning in CHRBLK::GetValPtrEx

modified:
  storage/connect/valblk.cpp

Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)

remove unused HA_READ_OUT_OF_SYNC

* use sql_mode_for_dates() where appropriate.
* always specify an argument for sql_mode_for_dates()
  (future-proof. easier to notice and fix if the caller
   will start using thd from a local variable or an argument)

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/plgdbsem.h

- Fiw a bug making records_in_range sometimes return a negative
  value.

modified:
  storage/connect/xindex.cpp

remove unused HA_CAN_EXPORT
(with the merge of "FLUSH TABLE <table_list> FOR EXPORT",
this functionality should be added back, but differently -
no table flag, handler::extra() returns an error instead)

remove unused HA_BLOCK_CONST_TABLE

remove half-applied "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"

fix simple_rename_or_index_change() to reuse alter_table_manage_keys()

it's not nice when unconfigured gtid prevents SHOW VARIABLES from working

remove TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE

use get_table_def_key() instead of create_table_def_key() where appropriate

Fix bug MDEV-4885: When performance schema is disabled, autosized parameters show 18446744073709551615 instead of -1
(patch by Serg)

modified:
  storage/connect/ha_connect.h

  Crash on second SELECT was because tshp was not reset to NULL in case of error.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabutil.cpp

modified:
  storage/connect/ha_connect.cc

  special columns are processed. This will be documented.
  Also some code cleanup and some changes to prepare the indexing of
  nullable columns (not achieve yet)

modified:
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/macutil.cpp
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.h
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.h
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xtable.h

MDEV-4797 - Spider crash on show create table spider table and replication
            multi source to one of the partitions
MDEV-4747 - Spider: add missing install_spider.sql

Made sure that innodb tables for persistent statistics would not
considered by the server as system tables.