Merge from 4.1 mysql-test/r/insert_update.result: Auto merged
Attach a file by drag & drop or click to upload
