put back the things that the merge removed sql/mysqld.cc: put back the things that the merge removed
Attach a file by drag & drop or click to upload
