fixed watermark different keys with transaction and without
update doc/ChangeLog