Fixes #3910. Backporting the upstream fix by dropping the f1 check. Ought to uprev the whole thing from the git repo, but need to figure out if we have any local changes first.
git-svn-id: file:///home/svn/framework3/trunk@11894 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
5f6995e8d3
commit
79903eb724
|
@ -348,7 +348,8 @@ class RbMysql
|
|||
rest_scramble_buff = data.unpack("CZ*Va8CvCva13Z13")
|
||||
raise ProtocolError, "unsupported version: #{protocol_version}" unless protocol_version == VERSION
|
||||
raise ProtocolError, "invalid packet: f0=#{f0}" unless f0 == 0
|
||||
raise ProtocolError, "invalid packet: f1=#{f1.inspect}" unless f1 == "\0\0\0\0\0\0\0\0\0\0\0\0\0"
|
||||
# Remove the f1 check to backport https://github.com/tmtm/ruby-mysql/commit/07ddfafafbd1d46bbb71c7cb54ae0f03bc998d27
|
||||
# raise ProtocolError, "invalid packet: f1=#{f1.inspect}" unless f1 == "\0\0\0\0\0\0\0\0\0\0\0\0\0"
|
||||
scramble_buff.concat rest_scramble_buff
|
||||
self.new protocol_version, server_version, thread_id, server_capabilities, server_charset, server_status, scramble_buff
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue