From 45712a9a1f7b24fab925e85e3df0bc644c8bc0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 19 Sep 2018 12:19:30 +0300
Subject: [PATCH] MDEV-13871: galera.galera_unicode_identifiers failed in
 buildbot with 'Unknown database'

Wait in second node until tables with databases are created.
---
 .../suite/galera/r/galera_unicode_identifiers.result |  6 +++---
 .../suite/galera/t/galera_unicode_identifiers.test   | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_unicode_identifiers.result b/mysql-test/suite/galera/r/galera_unicode_identifiers.result
index 9aee4616ec5..28e5ac11086 100644
--- a/mysql-test/suite/galera/r/galera_unicode_identifiers.result
+++ b/mysql-test/suite/galera/r/galera_unicode_identifiers.result
@@ -6,7 +6,7 @@ CREATE TABLE `table with space` (
 `column with space` INTEGER AUTO_INCREMENT PRIMARY KEY,
 `second column with space` INTEGER,
 UNIQUE `index name with space` (`second column with space`)
-);
+) engine=innodb;
 INSERT INTO `table with space` VALUES (1, 1);
 CREATE DATABASE `база`;
 USE `база`;
@@ -14,7 +14,7 @@ CREATE TABLE `таблица` (
 `първа_колона` INTEGER PRIMARY KEY,
 `втора_колона` INTEGER,
 UNIQUE `индекс` (`втора_колона`)
-);
+) engine=innodb;
 INSERT INTO `таблица` VALUES (1, 1);
 CREATE DATABASE `втора база`;
 USE `втора база`;
@@ -22,7 +22,7 @@ CREATE TABLE `втора таблица` (
 `първа колона` INTEGER,
 `втора колона` INTEGER,
 KEY `първи индекс` (`първа колона`)
-);
+) engine=innodb;
 INSERT INTO `втора таблица` VALUES (1, 1);
 USE `database with space`;
 SELECT `second column with space` FROM `table with space`;
diff --git a/mysql-test/suite/galera/t/galera_unicode_identifiers.test b/mysql-test/suite/galera/t/galera_unicode_identifiers.test
index f3df60a6415..c0c95768650 100644
--- a/mysql-test/suite/galera/t/galera_unicode_identifiers.test
+++ b/mysql-test/suite/galera/t/galera_unicode_identifiers.test
@@ -13,6 +13,8 @@ SET GLOBAL wsrep_sync_wait = 15;
 
 --connection node_1
 
+--let $innodb_num_tables_orig = `SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES`
+
 # Spaces in identifiers
 
 CREATE DATABASE `database with space`;
@@ -21,7 +23,7 @@ CREATE TABLE `table with space` (
 	`column with space` INTEGER AUTO_INCREMENT PRIMARY KEY,
 	`second column with space` INTEGER,
 	UNIQUE `index name with space` (`second column with space`)
-);
+) engine=innodb;
 INSERT INTO `table with space` VALUES (1, 1);
 
 # Unicode identifiers
@@ -32,7 +34,7 @@ CREATE TABLE `таблица` (
 	`първа_колона` INTEGER PRIMARY KEY,
 	`втора_колона` INTEGER,
 	UNIQUE `индекс` (`втора_колона`)
-);
+) engine=innodb;
 
 INSERT INTO `таблица` VALUES (1, 1);
 
@@ -44,11 +46,15 @@ CREATE TABLE `втора таблица` (
 	`първа колона` INTEGER,
 	`втора колона` INTEGER,
 	KEY `първи индекс` (`първа колона`)
-);
+) engine=innodb;
 
 INSERT INTO `втора таблица` VALUES (1, 1);
 
 --connection node_2
+# Wait until 3 above tables with databases are created also to this node
+--let $wait_condition = SELECT COUNT(*) = $innodb_num_tables_orig + 3 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+--source include/wait_condition.inc
+
 USE `database with space`;
 SELECT `second column with space` FROM `table with space`;