Fix import.
Reset the branch state due to improper import. RHEL git ref that the branch was reset to <d02ca0175d85719f15ea6c0354771ace7b39b92b>. Summary: * `.gitignore` Loosen the matching rules. * `*.patch` Delete patches wrongly imported from another repository. Related: rhbz#2149262
This commit is contained in:
parent
92643afbea
commit
fb7ac09a36
6
.gitignore
vendored
6
.gitignore
vendored
@ -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
|
||||
|
@ -1,22 +0,0 @@
|
||||
From cca57b97ad6d1b1b985376be110b89d2b487dea6 Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Patterson <tenderlove@ruby-lang.org>
|
||||
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
|
Loading…
Reference in New Issue
Block a user