commit 41bf4520231bb6454333d6acb1e011bfc9976bae
author Dean Troyer <dtroyer@gmail.com> Mon Jan 28 14:04:39 2013 -0600
committer Dean Troyer <dtroyer@gmail.com> Mon Jan 28 14:32:05 2013 -0600
tree fbe47d979ea98a2a835abf32023f7a598019f2b7
parent 3b3a6d78a63e93b43d3815f7e32a32458a82a3a9

Handle nested xtrace states

The lib/database abstraction includes the appropriate database file that also
contains the $XTRACE bits at entry and exit.  The nested XTRACE handling overwrote
the value from lib/database.  So...make the nested files use their own
XTRACE variables.

Change-Id: Ibdfc8d7d1e1457a9bc889b781ce176b417789ea1

lib/databases/mysql

diff --git a/lib/databases/mysql b/lib/databases/mysql
index 9524253..94aedc6 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -5,7 +5,7 @@
 # DATABASE_{HOST,USER,PASSWORD} must be defined
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 register_database mysql
@@ -121,4 +121,4 @@
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE