-
Committer:
Stewart Smith
-
Date:
2013-01-07 03:54:01 UTC
-
Revision ID:
stewart@flamingspork.com-20130107035401-btgxperqkyg4v6mr
reverse the bad merge from previous revision (r387 - Merge lp:~lp-dev-merge-bot/percona-server/staging-5.1 containing lp:~vlad-lesin/percona-server/5.1-bug1049871-injections-gca to 5.5 - one small conflict
modified). This merge was incorrect and caused rpl.rpl_mdev382 to fail