From 089ec7d4dcfe08a0014b30862bc9588a2f9439f4 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 25 Jun 2019 17:15:30 +0100
Subject: [PATCH] MCOL-3391 Fix columnstore_upgrade unicode support

The columnstore_upgrade() procedure would break on utf8 table names.
This patch fixes that.
---
 dbcon/mysql/columnstore_info.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dbcon/mysql/columnstore_info.sql b/dbcon/mysql/columnstore_info.sql
index 7655b5f16..b2f5e50d1 100644
--- a/dbcon/mysql/columnstore_info.sql
+++ b/dbcon/mysql/columnstore_info.sql
@@ -101,7 +101,7 @@ END //
 create procedure columnstore_upgrade()
 `columnstore_upgrade`: BEGIN
     DECLARE done INTEGER DEFAULT 0;
-    DECLARE schema_table VARCHAR(100) DEFAULT "";
+    DECLARE schema_table VARCHAR(100) CHARACTER SET utf8 DEFAULT "";
     DECLARE table_list CURSOR FOR select concat('`', table_schema,'`.`',table_name,'`') from information_schema.tables where engine='columnstore';
     DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
     OPEN table_list;
@@ -115,6 +115,5 @@ create procedure columnstore_upgrade()
         DEALLOCATE PREPARE stmt;
     END LOOP;
 END //
-delimiter ;
 
 DELIMITER ;