Merge remote branch 'origin/upstream' into tempbranch

database/migrate.py

 #!/usr/bin/python -u
 
 import os, sys, re, subprocess, tempfile
 from optparse import OptionParser
 import common
 import MySQLdb, MySQLdb.constants.ER
 from autotest_lib.client.common_lib import global_config, utils
 from autotest_lib.database import database_connection
 
 MIGRATE_TABLE = 'migrate_info'
@@ skipping 185 matching lines @@
 
         assert self.get_db_version() == version
         print 'At version', version
 
 
     def _migrate_from_base(self):
         self.confirm_initialization()
 
         migration_script = utils.read_file(
                 os.path.join(os.path.dirname(__file__), 'schema_051.sql'))
+        migration_script = migration_script % (
+                dict(username=self._database.get_database_info()['username']))
         self.execute_script(migration_script)
 
         self.create_migrate_table()
         self.set_db_version(51)
 
 
     def confirm_initialization(self):
         if not self.force:
             response = raw_input(
                 'Your %s database does not appear to be initialized.  Do you '
@@ skipping 155 matching lines @@
 def get_migration_manager(db_name, debug, force):
     database = database_connection.DatabaseConnection(db_name)
     database.debug = debug
     database.reconnect_enabled = False
     database.connect()
     return MigrationManager(database, force=force)
 
 
 if __name__ == '__main__':
     main()