Merge 2.1 r316 and r317.

This commit is contained in:
Daniel Nichter
2012-07-19 12:54:32 -06:00
parent 81d541ec05
commit d8cef2e902
3 changed files with 15 additions and 9 deletions

View File

@@ -63,7 +63,7 @@ export PATH="$PATH:/usr/sbin:$MYSQL_BASE_DIR/bin"
#############################
sandbox/test-env checkconfig || exit 1
sandbox/test-env stop || exit 1
sandbox/test-env kill
sandbox/test-env kill || exit 1
sandbox/test-env start || exit 1
#######################