From 8c658375f11074a9fa13d738497d80b8c8d164c1 Mon Sep 17 00:00:00 2001
From: Noah Potash <npotash@outbreaklabs.com>
Date: Tue, 24 May 2016 20:01:42 -0400
Subject: [PATCH 1/2] Fixes #10. Fixed resource definition for keywords, which
 was breaking transactions (and probably many other things)

---
 .../MySql.Data/Properties/Resources.Designer.cs | 17 ++++++++++++++++-
 Source/MySql.Data/project.json                  |  3 ++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Source/MySql.Data/Properties/Resources.Designer.cs b/Source/MySql.Data/Properties/Resources.Designer.cs
index 3539e19f4..e370e385c 100644
--- a/Source/MySql.Data/Properties/Resources.Designer.cs
+++ b/Source/MySql.Data/Properties/Resources.Designer.cs
@@ -8,6 +8,9 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using System.IO;
+using System.Reflection;
+
 namespace MySql.Data.MySqlClient.Properties
 {
     using System;
@@ -615,7 +618,19 @@ public static string keywords
         {
             get
             {
-                return "keywords";
+                return keywordsResource.Value;
+            }
+        }
+
+        private static Lazy<string> keywordsResource = new Lazy<string>(LoadKeywords);
+
+        private static string LoadKeywords()
+        {
+            var assembly = typeof(Resources).GetTypeInfo().Assembly;
+            var resourceStream = assembly.GetManifestResourceStream("MySql.Data.Properties.keywords.txt");
+            using (var reader = new StreamReader(resourceStream, System.Text.Encoding.UTF8))
+            {
+                return reader.ReadToEnd();
             }
         }
 
diff --git a/Source/MySql.Data/project.json b/Source/MySql.Data/project.json
index 9de96419c..1497cfaae 100644
--- a/Source/MySql.Data/project.json
+++ b/Source/MySql.Data/project.json
@@ -13,7 +13,8 @@
         "extensions\\RT",
         "Replication"
       ]
-    }
+    },
+    "embed": "Properties\\keywords.txt"
   },
   "packOptions": {
     "tags": [ "coreclr", "dnxcore50", "netstandard", "netcore", "mysql" ],

From c51705587d87e859d5456d36985a7afecb4fca1d Mon Sep 17 00:00:00 2001
From: Noah Potash <npotash@outbreaklabs.com>
Date: Tue, 24 May 2016 20:26:37 -0400
Subject: [PATCH 2/2] Bumped version number

---
 Source/MySql.Data/project.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/MySql.Data/project.json b/Source/MySql.Data/project.json
index 1497cfaae..d9d8bd70c 100644
--- a/Source/MySql.Data/project.json
+++ b/Source/MySql.Data/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.9.8-rc2-004",
+  "version": "6.9.8-rc2-005",
   "description": "MySQL client Library targeting netstandard 1.3",
   "authors": [ "Oracle", "SapientGuardian", "ebyte23" ],
   "buildOptions": {