Skip to content

Commit

Permalink
Update to MySQL driver to 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
accelerator74 committed Jul 16, 2024
1 parent fc88530 commit 7fe61d9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions extensions/mysql/mysql/MyDriver.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@
#include <WinSock2.h>
#endif

#include <mysql_version.h>
#if MYSQL_VERSION_ID < 80000
#include <my_global.h>
#include <my_sys.h>
#else
typedef bool my_bool;
#endif
#include <mysql.h>

// On macOS, the MySQL includes define min/max.
Expand Down
12 changes: 6 additions & 6 deletions tools/checkout-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ismac=0
iswin=0

archive_ext=tar.gz
decomp="tar zxf"
decomp="tar xf"

if [ `uname` = "Darwin" ]; then
ismac=1
Expand All @@ -47,7 +47,7 @@ getmysql ()
if [ `command -v wget` ]; then
wget -q $mysqlurl -O $mysqlfolder.$archive_ext
elif [ `command -v curl` ]; then
curl -sS -o $mysqlfolder.$archive_ext $mysqlurl
curl -L -sS -o $mysqlfolder.$archive_ext $mysqlurl
else
echo "Failed to locate wget or curl. Install one of these programs to download MySQL."
exit 1
Expand All @@ -69,8 +69,8 @@ elif [ $iswin -eq 1 ]; then
# The folder in the zip archive does not contain the substring "-noinstall", so strip it
mysqlver=${mysqlver/-noinstall}
else
mysqlver=mysql-5.7.44-linux-glibc2.12-i686
mysqlurl=https://cdn.mysql.com/archives/mysql-5.7/$mysqlver.$archive_ext
mysqlver=mysql-8.0.38-linux-glibc2.28-i686
mysqlurl=https://dev.mysql.com/get/Downloads/MySQL-8.0/$mysqlver.$archive_ext
fi
if [ $download_mysql -eq 1 ]; then
getmysql
Expand All @@ -85,8 +85,8 @@ elif [ $iswin -eq 1 ]; then
mysqlver=mysql-5.5.62-winx64
mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext
else
mysqlver=mysql-5.7.44-linux-glibc2.12-i686
mysqlurl=https://cdn.mysql.com/archives/mysql-5.7/$mysqlver.$archive_ext
mysqlver=mysql-8.0.38-linux-glibc2.28-x86_64
mysqlurl=https://dev.mysql.com/get/Downloads/MySQL-8.0/$mysqlver.$archive_ext
fi
if [ $download_mysql -eq 1 ]; then
getmysql
Expand Down

0 comments on commit 7fe61d9

Please sign in to comment.