From 737701baffeb17edce4656c0d0ca66555bac642d Mon Sep 17 00:00:00 2001 From: Ben Osheroff Date: Mon, 23 Nov 2015 11:42:51 -0800 Subject: [PATCH] look for mysql database in schema *after* adding databases --- .../com/zendesk/maxwell/schema/SchemaStore.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zendesk/maxwell/schema/SchemaStore.java b/src/main/java/com/zendesk/maxwell/schema/SchemaStore.java index ce465226a..59c42466c 100644 --- a/src/main/java/com/zendesk/maxwell/schema/SchemaStore.java +++ b/src/main/java/com/zendesk/maxwell/schema/SchemaStore.java @@ -235,14 +235,6 @@ private void restoreFrom(BinlogPosition targetPosition) this.schema_id = schemaRS.getLong("id"); - if ( this.schema.findDatabase("mysql") == null ) { - LOGGER.info("Could not find mysql db, adding it to schema"); - SchemaCapturer sc = new SchemaCapturer(connection, "mysql"); - Database db = sc.capture().findDatabase("mysql"); - this.schema.addDatabase(db); - shouldResave = true; - } - p = connection.prepareStatement("SELECT * from `maxwell`.`databases` where schema_id = ? ORDER by id"); p.setLong(1, this.schema_id); @@ -252,6 +244,14 @@ private void restoreFrom(BinlogPosition targetPosition) this.schema.getDatabases().add(restoreDatabase(dbRS.getInt("id"), dbRS.getString("name"), dbRS.getString("encoding"))); } + if ( this.schema.findDatabase("mysql") == null ) { + LOGGER.info("Could not find mysql db, adding it to schema"); + SchemaCapturer sc = new SchemaCapturer(connection, "mysql"); + Database db = sc.capture().findDatabase("mysql"); + this.schema.addDatabase(db); + shouldResave = true; + } + if ( shouldResave ) this.schema_id = saveSchema(); }