sql/mysqld.cc: Post-merge fix sql/set_var.cc: Post-merge fix
Attach a file by drag & drop or click to upload
