-Note 1031 Table storage engine for 't1' doesn't have this option
+Note 1031 Table storage engine for 'InnoDB' doesn't have this option

They were caused by a change in MariaDB which changed ER_ILLEGAL_HA message 
text to be like:
"Storage engine InnoDB of the table `test`.`t1` doesn't have this option"

Some the error calls were changed to pass new parameters, but some were left
to be old. Also the error text in errmsg-ut8.txt was not changed.

- Update trivial .reject/.result differences (all checked)

must use C++ linking due to client library using SSL library, which needs
C++ linking

- Take into account that Dynamic_array::back() now returns 
  pointer to the last element (it used to return pointer to 
  right after the last element)
- Fix error messages merge: ER_INTERNAL_ERROR was defined 
  independently by both mysql-5.6 and mariadb-5.5. Switch 
  to their error number, and still support ours for compatibility.

- strict.test updated (changed back) after the cset with "Fix 
  type_newdecimal.test ..." two csets ago
- row-checksum.test changed the code from HA_WRONG_CREATE_OPTION 
  to ER_ILLEGAL_HA_CREATE_OPTION, like mysql-5.6 did

- MariaDB does not have mysql.slave_master_info, mysql.slave_relay_log_info ,mysql.slave_worker_info
  or mysql.ndb_binlog_index tables.
- Some tests expected to have these tables (this was an incorrect merge from 5.6, which merged 
  necessary tables like mysql.innodb*stats, but also got these tables)

Update log_tables.test: some definitions of columns have changed, and slow_log got 'thread_id' column.

Fix fix_priv_tables.test: make mysql_system_tables_fix.sql to not modify user.password_expired column.

- make the test output stable
- make Log_to_csv_event_handler::log_slow() to write the value 
  of thd->thread_id (it didn't, and so 0 was always logged).

- Work around the problem by forcing recalc_pool to free its buffer
  in dict_stats_recalc_pool_deinit().

 "Unknown table tbl" is now "Unknown table database.tbl"
(part#3)

 "Unknown table tbl" is now "Unknown table database.tbl"

Merged all ddl_logging code.
Merged sql_partition.cc
innodb_mysql_lock2.test and partition_cache.test now works.
Changed interface to strconvert() to make it easier to use with not \0 terminated strings.

sql/sql_partition.cc:
  Full merge with 5.6
sql/sql_table.cc:
  Merged all ddl_logging code
sql/strfunc.cc:
  Added from_length argument to strconvert() to make it possible to use without end terminated strings.
sql/strfunc.h:
  Added from_length argument to strconvert() to make it possible to use without end terminated strings.

 "Unknown table tbl" is now "Unknown table database.tbl"

  persistent table statistics with ANALYZE TABLE commands