mariadb: my.cnf edits apply to --client-only

Closes #20533.
mariadb 5.5.31

Closes #20531.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Wine --devel 1.6-rc2

Closes #20539.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
tup 0.6.5

Closes #20541.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Merge remote-tracking branch 'upstream/master'