into shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217 client/mysqltest.c: Manual merge 4.1->5.0
Attach a file by drag & drop or click to upload
