mysql-trunk-merge to take into account the changes introduced by the fix for bug #30302.
Attach a file by drag & drop or click to upload
