Merge pull request #12 from infopark/mysql_blob_streaming_2.5.0

mysql_blob_streaming version 2.5.0

.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - "2.2.8"
-  - "2.3.5"
+  - "2.7.5"
+  - "2.6.9"
+

CHANGELOG.md

@@ -1,12 +1,32 @@
 All notable changes to this project will be documented in this file.
 
 This gem lives here https://github.com/infopark/mysql_blob_streaming.
+## v2.5.0 - 2022-05-03
+
+### Reason to make changes
+
+- make gem compatible with MariaDB 10.2 and 10.3 (see Bug https://bugs.mysql.com/bug.php?id=87337)
+- Tested with the following versions:
+  - MySQL 5.6
+  - MySQL 5.7
+  - MySQL 8.0.2
+  - MariaDB 10.2
+  - MariaDB 10.3
+
+### Compatible changes
+
+- add condition to check MySQL version in /ext/mysql_blob_streaming/mysql_blob_streaming.c
+  #if MYSQL_VERSION_ID >=80000 && MYSQL_VERSION_ID <80030
+    #include <stdbool.h>
+    typedef bool my_bool;
+  #endif
+
 
 ## v2.4.0 - 2021-03-23
 
 ### Reason to make changes
 
-- make gem compatible with MySQL version ~> 8.0.1  
+- make gem compatible with MySQL version ~> 8.0.1
 
 ### Compatible changes
 

README.markdown

@@ -39,3 +39,7 @@ Install it like any other Gem:
     gem install mysql_blob_streaming-X.X.X.gem
 
 Run it with root privileges if needed.
+
+## Development/Tests
+
+    rake

Rakefile

@@ -35,5 +35,6 @@ task :prepare_test_db do
     sh "mysqladmin", "-uroot", "--force", "drop", database_config['database']
   end
   sh "mysqladmin", "-uroot", "create", database_config['database']
-  sh "mysql", "-uroot", "-e", "grant all on #{database_config['database']}.* to '#{database_config['username']}'@'localhost' identified by '#{database_config['password']}'"
+  sh "mysql", "-uroot", "-e", "CREATE USER IF NOT EXISTS '#{database_config['username']}'@'localhost' IDENTIFIED BY '#{database_config['password']}'"
+  sh "mysql", "-uroot", "-e", "GRANT ALL ON  #{database_config['database']}.* TO '#{database_config['username']}'@'localhost'"
 end

ext/mysql_blob_streaming/mysql_blob_streaming.c

@@ -4,7 +4,8 @@
 #include <mysql.h>
 #include <errmsg.h>
 
-#if MYSQL_VERSION_ID >=80000
+#if MYSQL_VERSION_ID >=80000 && MYSQL_VERSION_ID <80030
+  #include <stdbool.h>
   typedef bool my_bool;
 #endif
 

lib/mysql_blob_streaming/version.rb

@@ -1,3 +1,3 @@
 class MysqlBlobStreaming
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

test/test.rb

@@ -138,7 +138,7 @@ def test_should_not_link_against_libruby_see_bug_12701
     assert !Dir.glob(libraries).empty?
 
     # sanity check to see if we got any sensible output from our dependency checker at all
-    assert dependencies.include?(running_on_mac ? "libmysql" : "libc.so")
+    assert dependencies.match?(running_on_mac ? /libmysql|libmariadb/ : /libc.so/)
 
     assert !dependencies.include?("libruby")
   end