Merge from 5.1 into 5.5. Conflicts: * sql/log.h * sql/sql_repl.cc
Attach a file by drag & drop or click to upload
