sql/mysqld.cc: Auto merged Docs/manual.texi: Merged. Need to re-add Jeremy's line
Attach a file by drag & drop or click to upload
