Field_geom::store() should check if the source is it's value.

Fixed perfschema.relaylog failure.

mysql-test/suite/perfschema/r/relaylog.result:
  Failed file opens are not shown in P_S. Relevant revision:
  marc.alff@oracle.com-20120807154151-cwuazxu341rvrnmg

Temorary fix for a number of replication tests (rpl.rpl_temp_table_mix_row 
rpl.rpl_trunc_temp rpl.rpl_current_user rpl.rpl_gtid_master_promote):

- THD::decide_logging_format() should not assume that mysql.gtid_slave_pos is 
  a non-replicated table. This used to cause unintended behavior for COMMIT 
  statement: replication would switch to row-based, etc.

The question of what should be done when a user issues a statement that
explicitly modifies mysql.gtid_slave_pos table remains open.

Workaround for a possible GCC bug happening in my_fill_ucs2:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58039

Commenting out the optimized loop.
Using the original MySQL version.

modified:
  strings/ctype-ucs2.c

Fixed parts.partition_mgm_lc2_innodb, parts.partition_mgm_lc2_archive,
parts.partition_mgm_lc2_memory, parts.partition_mgm_lc2_myisam failures.

Applied lost changes from revision
mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t

mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t

Fixed main.plugin, main-test_sql_discovery.plugin failures.

storage/example/ha_example.cc:
  Issue a warning independently of DBUG status (needed for testing).

Fixed main.partition_open_files_limit, innodb.innodb_bug12400341 failures.

These testcases use --max-connections=N command line option, which
was declared PARSE_EARLY during the merge. Embedded didn't handle
early options and failed to start due to unknown command line
option.

libmysqld/lib_sql.cc:
  Let embedded handle early options.
sql/mysqld.cc:
  Moved handling of early options to a separate function.
sql/mysqld.h:
  Moved handling of early options to a separate function.

Fixed funcs_1.is_statistics_mysql_embedded, funcs_1.is_columns_mysql_embedded,
funcs_1.is_table_constraints_mysql_embedded, funcs_1.is_tables_mysql_embedded
failures.

mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.

Fixed main.partition_cache, main.partition_cache_innodb,
main.partition_cache_myisam, main.query_cache failures.

libmysqld/emb_qcache.cc:
  Restore proper method to retrieve warnings number.

Added forgotten partition_explicit_prune from mysql-5.6.

Backported the fix for
Bug#13559657: PARTITION SELECTION DOES NOT WORK WITH VIEWS
from mysql-5.6

There is a race condition during shutdown, that happens when "show status" runs during shutdown. 
Functions show_slave_running(), show_slave_received_heartbeats(), show_heartbeat_period() would dereference NULL pointer master_info_index, after this variable is  set to NULL in slave_end() during shutdown.
Fix introduces check for master_info_index == NULL in the affected functions.

Fixed "check of testcases" failure.

Value of INFORMATION_SCHEMA.PLUGINS.PLUGIN_TYPE_VERSION was
pointing to incorrect address and could change after server
restart.

storage/innobase/handler/i_s.cc:
  Use proper plugin info pointer (struct st_mysql_information_schema
  instead of ST_FIELD_INFO[]).

Fixed archive.archive non-debug failure.

Applied revision:
sergey.vojtovich@oracle.com-20111008171828-vje5pumzvl04rdbb

Archive didn't read blobs from original table while
performing REPAIR TABLE with non-debug builds.

storage/archive/ha_archive.cc:
  Mark all columns for read independently of DBUG state.
  It instructs ::get_row_version2() to read all blobs.

Fixed sys_vars.log_error_func, sys_vars.log_error_func2,
maria.small_blocksize, sys_vars.autocommit_func3, sys_vars.autocommit_func2,
sys_vars.autocommit_func4, sys_vars.autocommit_func5,
sys_vars.tx_isolation_func, main.pool_of_threads, innodb.innodb,
archive.archive-big, parts.part_supported_sql_func_innodb,
parts.partition_decimal_myisam, parts.partition_decimal_innodb,
main.sum_distinct-big, percona.innodb_sys_index,
percona.percona_flush_contiguous_neighbors failures.

libmysqld/lib_sql.cc:
  Restore proper method to retrieve warnings number.

Fixed parts.partition_alter1_1_2_innodb, parts.partition_alter1_2_innodb,
parts.partition_alter2_1_1_innodb, parts.partition_alter2_1_2_innodb,
parts.partition_alter2_2_1_innodb, parts.partition_alter2_2_2_innodb,
parts.partition_alter4_innodb failures.

mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter4_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa

Fixed parts.partition_alter1_1_innodb failure.

mysql-test/suite/parts/t/partition_alter1_1_innodb.test:
  Applied hunk from 5.6 test: test takes long time, so only run it with
  the --big-test mtr-flag.

Fixed innodb.innodb_mysql failure.

mysql-test/include/mix1.inc:
  Applied hunk from 5.6 test: error text has changed during merge.

Fixed archive.archive failure.

Applied remnants of two revisions, which were partially merged.

Rev. 3225.1.1 (5.0 compatibility):

  BUG#11756687 - 48633: ARCHIVE TABLES ARE NOT UPGRADEABLE

  Archive table created by 5.0 were not accessible.

  This patch adds various fixes so that 5.0 archive tables
  are readable and writable. Though it is strongly recommended
  to avoid binary upgrade of archive tables whenever it is
  possible.

Rev. 3710 (due to valgrind warnings):

  Bug#13907676: HA_ARCHIVE::INFO
  In WL#4305 the refactoring of the archive writer,
  it could flush the writer when it was not yet open.

  This was due to if bulk insert was used but no
  rows was actually inserted (write_row was never called),
  the writer was marked dirty even if it was not open.

  Fix was to only mark it as dirty if it was opened.

mysql-test/std_data/bug48633.ARM:
  A test case for BUG#11756687: archive table created by 5.0.95.
mysql-test/std_data/bug48633.ARZ:
  A test case for BUG#11756687: archive table created by 5.0.95.
mysql-test/std_data/bug48633.frm:
  A test case for BUG#11756687: archive table created by 5.0.95.
mysql-test/suite/archive/archive.result:
  Modified a test case for BUG#47012 according to fix for
  BUG#11756687.
  Added a test case for BUG#11756687.
mysql-test/suite/archive/archive.test:
  Modified a test case for BUG#47012 according to fix for
  BUG#11756687.
  Added a test case for BUG#11756687.
  
  No need to remove .ARM files anymore: DROP TABLE will take
  care of them.
storage/archive/azio.c:
  Do not write AZIO (v.3) header to GZIO file (v.1).
  
  Added initialization of various azio_stream members
  to read_header() so it can proceed with v.1 format.
  
  Update data start position only when reading first
  GZIO header. That is only on azopen(), but never on
  azread().
storage/archive/ha_archive.cc:
  Removed guardians that were rejecting to open v.1 archive
  tables.
  
  Reload .frm when repairing v.1 tables - they didn't have
  storage for .frm.
  
  Do not flush write stream when it is not open.
  
  Let DROP TABLE remove 5.0 .ARM files.

Fixed debian/ubuntu build failure.

cmake/ssl.cmake:
  Do not prefer static SSL libraries for WITH_SSL=system|yes as there is
  no guarantee that they will link well with MariaDB shared objects.
  Specifically on debian/ubuntu static SSL libraries are built without
  -fPIC.
  
  Restore 5.6 behavior. 10.0.3 never prefer static SSL libraries.

Fixed failure of one of the test case from innodb_ext_key.test.
The fact is that the innodb code may return statistical data
on record per key values that is far off the real numbers. 
This is exactly what happened in mariadb-5.5 with this test case.

Added an ANALYZE command in this test case to avoid this problem.
The same change will be done in mariadb-5.5

Fixed connect.grant failure.

sql/create_options.cc:
  Keep "first" list intact, allocate new list for merge result.
  
  Normally "first" is options list on TABLE_SHARE. ALTER TABLE may fail
  after the merge and leave share with corrupt list in the table definition
  cache.
sql/create_options.h:
  Construct engine_option_value from another engine_option_value.

Fixed maria.maria and funcs_1.is_tables failure.

sql/sql_table.cc:
  C_ALTER_TABLE_FRM_ONLY lost it's meaning after merge of inplace alter:
  now it is used even if table is to be copied.
  Otherwise: how can row format change go without notifying storage engine?
  Removed check for create_table_mode for now, to be discussed.

Fixed query_response_time build failure.

plugin/query_response_time/query_response_time.cc:
  my_atomic_rwlock_rdlock() may update time_collector_lock structure.
  Remove const modifier from relevant methods.

Fixed debian/ubuntu packages build failure.

debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch:
  tmp_user has now extra column, updated patch accordingly.

Fixed main.innodb_mysql_sync failure.

TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE is not same as
TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE. Comment in sql_table.cc says:

      Storage engine has requested exclusive lock only for prepare phase
      and we are not under LOCK TABLES.
      Don't mark TABLE_SHARE as old in this case, as this won't allow opening
      of table by other threads during main phase of in-place ALTER TABLE.

At this moment we hold exclusive metadata lock, all we should do
is purge unused TABLE objects.

sql/sql_base.cc:
  Restore 5.6 behavior of TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE.
sql/sql_base.h:
  Restore 5.6 behavior of TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE.

Fixed main.mysql--help failure.

mysql-test/r/mysqld--help.result:
  PFS_MAX_RWLOCK_CLASS was raised to 40 during the merge.

Fixed sql_discovery.simple failure.

storage/sequence/sequence.cc:
  Let sequence share class have unique name to avoid collision with other
  classes.
storage/test_sql_discovery/test_sql_discovery.cc:
  Let test_sql_discovery share class have unique name to avoid collision with
  other classes.

Fixed innodb.help_url failure.

mysql-test/suite/innodb/r/help_url.result:
  Accessing discarded tablespace doesn't cause loud error message anymore.
  Use different way to retrieve refman link.
mysql-test/suite/innodb/t/help_url.test:
  Accessing discarded tablespace doesn't cause loud error message anymore.
  Use different way to retrieve refman link.

Fixed connect compilation failure (with ODBC).

storage/connect/odbconn.cpp:
  min/max are not defined by my_global.h anymore, include osutil.h instead.

- Make THD::raise_condition() call push_warning() after set_error_status() call.
  (they seem to have accidentally exchanged in this merge cset:
   sergii@pisem.net-20130721143919-7cltcw2l9g29f983)
- Rollback the patch from two csets before (the one with comment:
   Update filesort_debug.test (see comment #1 in MDEV-4786 for analysis))

- As of 10.0.2, MariaDB has mysql.gtid_slave_pos table as system table.

Fixed connect compilation failure.

storage/connect/csort.cpp:
  min/max are not defined by my_global.h anymore, include osutil.h instead.
storage/connect/filamfix.cpp:
  min/max are not defined by my_global.h anymore, include osutil.h instead.
storage/connect/ha_connect.cc:
  Renamed MYSQL_ERROR -> Sql_condition.
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
  Adjusted connect according to:
  WL#4305 - storage-engine private data area per physical table.
storage/connect/ha_connect.h:
  Adjusted connect according to:
  WL#4305 - storage-engine private data area per physical table.
storage/connect/inihandl.c:
  min/max are not defined by my_global.h anymore, include osutil.h instead.
storage/connect/osutil.h:
  min/max are not defined by my_global.h anymore, define them for C as well.
storage/connect/taboccur.cpp:
  Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/tabpivot.cpp:
  Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/tabtbl.cpp:
  Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/tabxcl.cpp:
  Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/value.cpp:
  min/max are not defined by my_global.h anymore, include osutil.h instead.
  Include server headers before osutil.h to avoid min/max redefinition.

Fixed test_sql_discovery compilation failure.

storage/test_sql_discovery/mysql-test/archive/discover.rdiff:
  archive.discover result has changed during merge. Adjusted discover.rdiff
  accordingly.
storage/test_sql_discovery/test_sql_discovery.cc:
  Adjusted test_sql_discovery according to:
  WL#4305 - storage-engine private data area per physical table.