bzr merge -r3810..3839 lp:codership-mysql/5.5

           be able to handle both

        Add new wsrep-related files to the DEB packages.

bzr merge -r tag:mariadb-5.5.28a lp:maria/5.5
...no conflicts

        Fixed templates for messages.

        Ubuntu 'control' file fixed.

        lindian-overrides files fixed.

        If settings are not suitable for the WSREP, just
        turn it off and keep working.

If connection kills itself (or own query), it will get an error consistently,
with both COM_PROCESSKILL and with "KILL [QUERY] id"

Assertion happened because sql_kill did not set OK status in diagnostic area
in the case of connection suicide (id to kill == thd->thread_id), issued 
via  COM_PROCESS_KILL , e.g using mysql_kill()

This patch ensures that diagnostic area is initialized in this specific case.

        Debian packaging, part II.
        Changes in the set of package-related files. Some were removed, some renamed,
        as we only keep the mariadb-galera-server package.

        Debian/Ubuntu packages fixed.
        The mariadb-server-5.5 and mariadb-server packages became
        mariadb-galera-server-5.5 and mariadb-galera-server respectively.
        The rest of packages are removed from the build.
        This patch reflects only files that were changed.
        Second part of this patch has only file renaming/deletions.

MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when converting to DECIMAL" on a query with aggregate functions and GROUP BY

fix: don't call field->val_decimal() if the field->is_null()
because the buffer at field->ptr might not hold a valid decimal value

sql/item_sum.cc:
  do not call field->val_decimal() if the field->is_null()
storage/maria/ma_blockrec.c:
  cleanup
storage/maria/ma_rrnd.c:
  cleanup
strings/decimal.c:
  typo

Fix some problems in the TC_LOG_MMAP commit processing, which could
lead to assertions in some cases.

Problems are mostly reproducible in MariaDB 10.0 with asynchroneous
commit checkpoints, but most of the problems were present in earlier
versions also.

Adjust unstable test case.

Properly drop all unused keys.
Patch by Igor Babaev.

mysql_config:
- add not only $pkgincludedir, but also $pkgincludedir/.. to the header search path,
  for #include <mysql/plugin.h> to work


scripts/mysql_config.sh:
  - don't support headers in */include anymore. only in */include/mysql
  - remove the incorrect "bug fix" (fixed correctly long time ago)
  - add not only $pkgincludedir, but also $pkgincludedir/.. to the header search path,
    for #include <mysql/plugin.h> to work
  - but don't do it, if $pkgincludedir/.. is /usr/include

followup fixes for MySQL Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ | HANDLE_FATAL_SIGNAL IN STRNLEN

Take into account that length of strings passed down to this function can be up to FN_REFLEN+1 bytes. including terminating zero.
The overwrite was caused by incomplete fix to MySQL Bug # 44834

If triggers are used for an insert/update/delete statement than the values of
all virtual columns must be computed as any of them may be used by the triggers.