From e7cbbc975684fab033683bec53918dc2af74f6fc Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Wed, 19 Apr 2023 13:09:21 +0200 Subject: [PATCH] Fix import. --- .gitignore | 6 ++--- .rubygem-mysql2.metadata | 2 ++ ....3-fix-assertion-mariadb-connector-c.patch | 22 ------------------- 3 files changed, 4 insertions(+), 26 deletions(-) create mode 100644 .rubygem-mysql2.metadata delete mode 100644 rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch diff --git a/.gitignore b/.gitignore index 5d357e5..0ccd823 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -SOURCES/mysql2-0.5.3-tests.txz -SOURCES/mysql2-0.5.3.gem -/mysql2-0.5.3-tests.txz -/mysql2-0.5.3.gem +/mysql2-*-tests.txz +/mysql2-*.gem diff --git a/.rubygem-mysql2.metadata b/.rubygem-mysql2.metadata new file mode 100644 index 0000000..85b62d0 --- /dev/null +++ b/.rubygem-mysql2.metadata @@ -0,0 +1,2 @@ +efae18a40b17065bff7f04732e8165d64393531c mysql2-0.5.3-tests.txz +75e6935c4d9a2b1c047d9e9b69c4c6d4c7e0faef mysql2-0.5.3.gem diff --git a/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch b/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch deleted file mode 100644 index 7707d01..0000000 --- a/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cca57b97ad6d1b1b985376be110b89d2b487dea6 Mon Sep 17 00:00:00 2001 -From: Aaron Patterson -Date: Tue, 30 Nov 2021 12:59:43 -0800 -Subject: [PATCH] fix assertion on maria - -downgrade psych ---- - spec/mysql2/client_spec.rb | 2 +- - -diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb -index 1519e0f5d..41fb834bf 100644 ---- a/spec/mysql2/client_spec.rb -+++ b/spec/mysql2/client_spec.rb -@@ -573,7 +573,7 @@ def run_gc - end - expect do - @client.query("SELECT SLEEP(1)") -- end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/) -+ end.to raise_error(Mysql2::Error, /Lost connection/) - - if RUBY_PLATFORM !~ /mingw|mswin/ - expect do