Include innodb dir in bootstrap archive.

Leaving it out breaks MariaDB replication status tables.

data/bootstrap/upgrade.sh

@@ -8,24 +8,25 @@ if [ -z "$VTDATAROOT" ]; then
   exit 1
 fi
 
+mysql_port=33306
 tablet_uid=99999
 tablet_dir=$VTDATAROOT/vt_0000099999
 
 set -e
 
 echo Starting mysqld
-mysqlctl -tablet_uid=$tablet_uid init -skip_schema
+mysqlctl -tablet_uid=$tablet_uid -mysql_port=$mysql_port init -skip_schema
 
 echo Running mysql_upgrade
 mysql_upgrade --socket=$tablet_dir/mysql.sock --user=vt_dba 
 
 echo Stopping mysqld
-mysqlctl -tablet_uid=$tablet_uid shutdown
+mysqlctl -tablet_uid=$tablet_uid -mysql_port=$mysql_port shutdown
 
 newfile=mysql-db-dir_$(cat $tablet_dir/data/mysql_upgrade_info).tbz
 
 echo Creating new bootstrap file: $newfile
-(cd $tablet_dir/data && tar -jcf ../data.tbz *)
+(cd $tablet_dir && tar -jcf data.tbz data innodb)
 mv $tablet_dir/data.tbz ./$newfile
 
 echo Removing tablet directory

go/vt/mysqlctl/mysqld.go

@@ -266,7 +266,7 @@ func (mysqld *Mysqld) Init(mysqlWaitTime time.Duration, bootstrapArchive string,
 	// Unpack bootstrap DB files.
 	dbTbzPath := path.Join(root, "data/bootstrap/"+bootstrapArchive)
 	log.Infof("decompress bootstrap db %v", dbTbzPath)
-	args := []string{"-xj", "-C", mysqld.config.DataDir, "-f", dbTbzPath}
+	args := []string{"-xj", "-C", mysqld.TabletDir, "-f", dbTbzPath}
 	if _, err = execCmd("tar", args, []string{}, ""); err != nil {
 		log.Errorf("failed unpacking %v: %v", dbTbzPath, err)
 		return err

test/mysql_flavor.py

@@ -62,7 +62,7 @@ class MariaDB(MysqlFlavor):
     return environment.vttop + "/config/mycnf/master_mariadb.cnf"
 
   def bootstrap_archive(self):
-    return "mysql-db-dir_10.0.10-MariaDB.tbz"
+    return "mysql-db-dir_10.0.13-MariaDB.tbz"
 
 
 if environment.mysql_flavor == "MariaDB":