* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified

include oqgraph into deb packages conditionally, just like we do with tokudb

Do not use merge_for_insert for commands which use SELECT because optimizer can't work with such tables.

Fixes which makes multi-delete working with normally merged views.

    When the distance in ST_BUFFER is too far negative the coordinates can run out of the operational
    area. We should just return an empty geometry in this case.

The testcase fails randomly due to ibuf merge happening in the background.
Fix not to do any merges with ibuf_debug enabled.

Previously IF NOT EXISTS was added in Debian version in revno 3543. 
Now added the same for Ubuntu.

MDEV-7435 Windows debug: Run-Time Check Failure #3 - The variable 'unused' is being used without being initialized.
Fixed as it's done in 10.0.

causes server crash

Analysis: If wrong data types used on foreign constraint there
was possibility that foreign->id is NULL when incorrect
foreign constraint was removed from the dictionary cache.

Fix: Add guard foreign->id != NULL before trying to lookup
or remove the foreign constraint from dictionary cache.

Tested using user database where problem was repeatable.

MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in file rem0rec.cc line 845

Debug assertion maybe too strict.

Analysis: Purge thread does not have thd and no access to
handlerton.

Fix: If thd does not exists we use sql_print_warning instead
of push_warning_printf.

added a script to regenerate certificates easily in the future (2035!)
restored server8k-key.pem to actually be 8K key, as it was supposed to

Backport from mysql 5.7. The patch reviewed, test added.

MDEV-6220 mysqldump will not backup database with --flush-logs parameter and log_error my.cnf parameter defined

some checks were "if [ -n "$err_log" ]", others were "if [ $want_syslog -eq 0 ]",
so when both are set, error log file was only partially initialized.
To avoid this ambiguity we reset want_syslog when error log file is used.

correct the check for PLUGIN_VAR_STR

mtr internally does the following:
1. $default_vardir=....
2. $opt_vardir=$default_vardir unless $opt_vardir;
3. $opt_vardir=realpath $opt_vardir unless IS_WINDOWS
4. if ($opt_vardir eq $default_vardir) { .... use /dev/shm ... }

thus we have to realpath $default_datadir too, otherwise
the comparison logic might be broken

add "mysql-compat-server" alias to MariaDB-server package

it's in the dead code (ifdef-ed out) so it doesn't matter what it is.
still better to keep it closer to the upstream

Let mtr handle SIGHUP the same way as SIGINT. This solves stale mysqld processes
left after broken/closed ssh connection.

            mysql.service failed to load

Added 'systemctl daemon-reload' command in postin and
postun rpm scripts.

mysql_alter_table() that is used in mysql_recreate_table() doesn't expect
many tables in the TABLE_LIST.

adjust enum values when reading them from frm

workaround for missing SP auto-reparse.
allow the user to disable stored_program_cache_size, if he wants

The test case tried to trigger a DEBUG_SYNC point at the end of a SELECT
SLEEP(5) statement. It did this by using EXECUTE 2, intending to trigger first
at the end of SET DEBUG_SYNC, and second at the end of the SELECT SLEEP(5).

However, in --ps-protocol mode, this does not work, because the SELECT is
executed in two steps (Prepare followed by Execute). Thus, the DEBUG_SYNC got
triggered too early, during the Prepare stage rather than Execute, and the
test case could race and information_schema.processlist see the thread in the
wrong state.

This patch fixes by changing the way the DEBUG_SYNC point is triggered. Now we
add a DBUG injection inside the code for SLEEP(5). This ensures that the
DEBUG_SYNC point is not activated until the SLEEP(5) is running, ensuring
that the following wait for completion will be effective.

DB-787 the tokudb_report_fractal_tree_info_for_db function can leak a db on an error path where db->open fails

Patch by James Taylor.