lp:~otto/maria/maria-fix-debian-copyright-5.5

Branch merges

Propose for merging

Ready for review for merging into lp:maria/5.5

Maria-captains: Pending requested 2014-04-26

Diff: 1082 lines (+1005/-61)

2 files modified

debian/copyright (+1004/-60)
man/mysqlman.1 (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4163. By Otto Kekäläinen on 2014-04-26

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

4162. By Michael Widenius on 2014-04-24

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 on 2014-04-23

Merge 5.3->5.5

4160. By Alexander Barkov on 2014-04-23

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

4159. By Alexander Barkov on 2014-04-21

Merge from 5.3

4158. By Alexander Barkov on 2014-04-21

Merge from 5.3.

4157. By Alexander Barkov on 2014-04-18

Merge from 5.3

4156. By Alexander Barkov on 2014-04-18

Merge from 5.3

4155. By Alexey Botchkov on 2014-04-16

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 on 2014-04-15

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.