Created by Otto Kekäläinen and last modified
Get this branch:
bzr branch lp:~otto/maria/maria-fix-debian-copyright-5.5
Only Otto Kekäläinen can upload to this branch. If you are Otto Kekäläinen please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Otto Kekäläinen

Recent revisions

4163. By Otto Kekäläinen

Updated machine readable copyright file (Closes: MDEV-5484). Small man page typofix.

4162. By Michael Widenius

MDEV-6129: Server crashes during UNION with ORDER BY field IS NULL

Fixed crashing bug for union queries where there was no real tables.

4161. By Alexander Barkov

Merge 5.3->5.5

4160. By Alexander Barkov

MDEV-6146 Can't mix (latin1_swedish_ci,NUMERIC) and (utf8_unicode_ci,IMPLICIT) for MATCH

4159. By Alexander Barkov

Merge from 5.3

4158. By Alexander Barkov

Merge from 5.3.

4157. By Alexander Barkov

Merge from 5.3

4156. By Alexander Barkov

Merge from 5.3

4155. By Alexey Botchkov

MDEV-6124 Audit plugin fails with the Percona-Server 5.6.
   Some lines of code in file_logger.c were lost while moving to the
   general MariaDB tree. Adding them.

4154. By Alexey Botchkov

MDEV-4856 SQL_ERROR_LOG shows 1146 errors which didnt appear in mysql client.
    The fill_schema_table() function used to call get_table_share() for a table name in WHERE
    then clear the error list. That way plugins receive the superfluous error notification if it
    happens in it. Also the problem was that error handler didn't prevent the suppressed
    error message from logging anyway as the logging happens in THD::raise_condition
    before the handler call.
    Trigger_error_handler is remade into Warnings_only_error_handler, so it stores the error
    message in all cases in the thd->stmt_da.
    Then later the stored error is raised.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.