Fixing "/*100000 ...*/" comments (i.e. MySQL style with 6-digits),
which were unintentionally broken in the MDEV-5009 patch.

modified:
  mysql-test/r/comments.result
  mysql-test/t/comments.test
  sql/sql_lex.cc

Fixed a wrong assertion.

backporting from the main 10.0

modified:
  mysql-test/r/func_like.result
  mysql-test/t/func_like.test
  sql/item_cmpfunc.cc

This test needs at least 320M for tokudb-max-lock-memory.
Normally tokudb-max-lock-memory is auto-sized to be 1/16th
of the available RAM size, and many our test VMs have 4G of RAM.

Do not calculate selectivity of conditions for the tables of the information schema.

The fix for bug #27937 was incomplete: it did not handle correctly the queries
containing UNION with global ORDER BY in subselects.

(better to have an address in the output than ??:0)

(PLUGIN_VAR_MEMALLOC is 0x8000 and cannot be saved in a char as such)"

https://github.com/Tokutek/ft-engine/issues/153

don't reset interrupted_query after sending the KILL signal, otherwise
the client won't know it has to stop fetching and printing the data.

a memory leak in save_index() first seen in the test case for mdev-5382.

When marking used columns the function find_field_in_table_ref() erroneously
called the walk method for the real item behind a view/derived table field
with the second parameter set to TRUE.
This erroneous code was introduced in 2006. 

Correct processing of view/derived with no tables added.

"Conditional jump or move depends on uninitialised"
in Item_time_typecast::get_date.

Adding "null_value" into the debug assert condition.

modified:
  mysql-test/r/func_time.result
  mysql-test/t/func_time.test
  sql-common/my_time.c
  sql/item_func.h
  sql/item_timefunc.cc
  sql/mysql_priv.h
  sql/time.cc

Fix ha_myisammrg::update_create_info() to do what ha_myisammrg::append_create_info() does -
take sub-table names from TABLE_LIST, not reverse engineer tablefile names.

Backport praveenkumar.hulakund@oracle.com-20120127081643-u7dxy23i8yyqarm7 from mysql-5.6

This was actually implemented as part of MDEV-4506, parallel replication.
Unfortunately, one of the conditionals was reversed. So fsync of master.info
was disabled in non-gtid mode, instead of in gtid mode.

So fix the conditional to be correct.

inintentionally broken during merge 5.5->10.0-base

modified:
  mysql-test/r/mysql_tzinfo_to_sql_symlink.result

run tokudb suites by default.
mark big and slow tests tokudb.change_column_all_1000_1 and
tokudb.change_column_all_1000_10 test as --big

Always use the value of table::file->stats.records when checking
whether a table with HA_STATS_RECORDS_IS_EXACT flag contains not
more than 1 record.

- For INSERT ... SELECT ... ON DUPLICATE KEY UPDATE, table elimination should 
  check which tables are referenced in the ON DUPLICATE KEY UPDATE clause.

The update of mysql.gtid_slave_pos during event replication used
the wrong way to disable binary logging for the table updates.
Fix to instead temporarily clear the OPT_BIN_LOG flag.

The bug was fixed by the patch applied to the 5.3 tree in the revision 3727.

sort directory data to make sure the same data order in the output
of mysql_tzinfo_to_sql on all platforms.

Add another column to SHOW SLAVE STATUS, and adjust test suite
to cope.