From 4637cf9221ca3329a6e71b4317839a77e11d88ee Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Tue, 20 Mar 2018 17:12:30 -0400
Subject: [PATCH] Use MySQL 5.5 for MySQL extension. (#786)

---
 AMBuildScript          | 4 ++--
 tools/checkout-deps.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index 853f0789..94f187a9 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -183,7 +183,7 @@ class SMConfig(object):
         self.mysql_root['x86'] = builder.options.mysql_path
       else:
         for i in range(7):
-          self.mysql_root['x86'] = ResolveEnvPath('MYSQL5', 'mysql-5.' + str(i))
+          self.mysql_root['x86'] = ResolveEnvPath('MYSQL55', 'mysql-5.' + str(i))
           if self.mysql_root['x86']:
             break
       if not self.mysql_root['x86'] or not os.path.isdir(self.mysql_root['x86']):
@@ -196,7 +196,7 @@ class SMConfig(object):
           self.mysql_root['x64'] = builder.options.mysql64_path
         else:
           for i in range(7):
-            self.mysql_root['x64'] = ResolveEnvPath('MYSQL5_64', 'mysql-5.' + str(i) + '-x86_64')
+            self.mysql_root['x64'] = ResolveEnvPath('MYSQL55_64', 'mysql-5.' + str(i) + '-x86_64')
             if self.mysql_root['x64']:
               break
         if not self.mysql_root['x64'] or not os.path.isdir(self.mysql_root['x64']):
diff --git a/tools/checkout-deps.sh b/tools/checkout-deps.sh
index f2b02373..3524aa38 100755
--- a/tools/checkout-deps.sh
+++ b/tools/checkout-deps.sh
@@ -42,13 +42,13 @@ getmysql ()
 }
 
 # 32-bit MySQL
-mysqlfolder=mysql-5.0
+mysqlfolder=mysql-5.5
 if [ $ismac -eq 1 ]; then
   mysqlver=mysql-5.5.28-osx10.5-x86
   mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext
 elif [ $iswin -eq 1 ]; then
-  mysqlver=mysql-noinstall-5.0.24a-win32
-  mysqlurl=https://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext
+  mysqlver=mysql-5.5.54-win32
+  mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext
   # The folder in the zip archive does not contain the substring "-noinstall", so strip it
   mysqlver=${mysqlver/-noinstall}
 else
@@ -58,7 +58,7 @@ fi
 getmysql
 
 # 64-bit MySQL
-mysqlfolder=mysql-5.0-x86_64
+mysqlfolder=mysql-5.5-x86_64
 if [ $ismac -eq 1 ]; then
   mysqlver=mysql-5.5.28-osx10.5-x86_64
   mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext