ruby-mysql 2.9.11 → 2.10.0

data/lib/mysql/constants.rb

@@ -1,5 +1,5 @@
 # coding: ascii-8bit
-# Copyright (C) 2003-2008 TOMITA Masahiro
+# Copyright (C) 2003 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 class Mysql
@@ -33,50 +33,88 @@ class Mysql
   COM_STMT_RESET          = 26
   COM_SET_OPTION          = 27
   COM_STMT_FETCH          = 28
+  COM_DAEMON              = 29
+  COM_BINLOG_DUMP_GTID    = 30
+  COM_RESET_CONNECTION    = 31
+  COM_CLONE               = 32
 
   # Client flag
-  CLIENT_LONG_PASSWORD     = 1         # new more secure passwords
-  CLIENT_FOUND_ROWS        = 1 << 1    # Found instead of affected rows
-  CLIENT_LONG_FLAG         = 1 << 2    # Get all column flags
-  CLIENT_CONNECT_WITH_DB   = 1 << 3    # One can specify db on connect
-  CLIENT_NO_SCHEMA         = 1 << 4    # Don't allow database.table.column
-  CLIENT_COMPRESS          = 1 << 5    # Can use compression protocol
-  CLIENT_ODBC              = 1 << 6    # Odbc client
-  CLIENT_LOCAL_FILES       = 1 << 7    # Can use LOAD DATA LOCAL
-  CLIENT_IGNORE_SPACE      = 1 << 8    # Ignore spaces before '('
-  CLIENT_PROTOCOL_41       = 1 << 9    # New 4.1 protocol
-  CLIENT_INTERACTIVE       = 1 << 10   # This is an interactive client
-  CLIENT_SSL               = 1 << 11   # Switch to SSL after handshake
-  CLIENT_IGNORE_SIGPIPE    = 1 << 12   # IGNORE sigpipes
-  CLIENT_TRANSACTIONS      = 1 << 13   # Client knows about transactions
-  CLIENT_RESERVED          = 1 << 14   # Old flag for 4.1 protocol
-  CLIENT_SECURE_CONNECTION = 1 << 15   # New 4.1 authentication
-  CLIENT_MULTI_STATEMENTS  = 1 << 16   # Enable/disable multi-stmt support
-  CLIENT_MULTI_RESULTS     = 1 << 17   # Enable/disable multi-results
+  CLIENT_LONG_PASSWORD                  = 1         # new more secure passwords
+  CLIENT_FOUND_ROWS                     = 1 << 1    # Found instead of affected rows
+  CLIENT_LONG_FLAG                      = 1 << 2    # Get all column flags
+  CLIENT_CONNECT_WITH_DB                = 1 << 3    # One can specify db on connect
+  CLIENT_NO_SCHEMA                      = 1 << 4    # Don't allow database.table.column
+  CLIENT_COMPRESS                       = 1 << 5    # Can use compression protocol
+  CLIENT_ODBC                           = 1 << 6    # Odbc client
+  CLIENT_LOCAL_FILES                    = 1 << 7    # Can use LOAD DATA LOCAL
+  CLIENT_IGNORE_SPACE                   = 1 << 8    # Ignore spaces before '('
+  CLIENT_PROTOCOL_41                    = 1 << 9    # New 4.1 protocol
+  CLIENT_INTERACTIVE                    = 1 << 10   # This is an interactive client
+  CLIENT_SSL                            = 1 << 11   # Switch to SSL after handshake
+  CLIENT_IGNORE_SIGPIPE                 = 1 << 12   # IGNORE sigpipes
+  CLIENT_TRANSACTIONS                   = 1 << 13   # Client knows about transactions
+  CLIENT_RESERVED                       = 1 << 14   # Old flag for 4.1 protocol
+  CLIENT_SECURE_CONNECTION              = 1 << 15   # New 4.1 authentication
+  CLIENT_MULTI_STATEMENTS               = 1 << 16   # Enable/disable multi-stmt support
+  CLIENT_MULTI_RESULTS                  = 1 << 17   # Enable/disable multi-results
+  CLIENT_PS_MULTI_RESULTS               = 1 << 18   # Multi-results in PS-protocol
+  CLIENT_PLUGIN_AUTH                    = 1 << 19   # Client supports plugin authentication
+  CLIENT_CONNECT_ATTRS                  = 1 << 20   # Client supports connection attribute
+  CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA = 1 << 21   # Enable authentication response packet to be larger than 255 bytes.
+  CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS   = 1 << 22   # Don't close the connection for a connection with expired password.
+  CLIENT_SESSION_TRACK                  = 1 << 23   # Capable of handling server state change information. Its a hint to the server to include the state change information in Ok packet.
+  CLIENT_DEPRECATE_EOF                  = 1 << 24   # Client no longer needs EOF packet
+  CLIENT_OPTIONAL_RESULTSET_METADATA    = 1 << 25   # The client can handle optional metadata information in the resultset.
+  CLIENT_ZSTD_COMPRESSION_ALGORITHM     = 1 << 26   # Compression protocol extended to support zstd compression method
+  CLIENT_CAPABILITY_EXTENSION           = 1 << 29   # This flag will be reserved to extend the 32bit capabilities structure to 64bits.
+  CLIENT_SSL_VERIFY_SERVER_CERT         = 1 << 30   # Verify server certificate.
+  CLIENT_REMEMBER_OPTIONS               = 1 << 31   # Don't reset the options after an unsuccessful connect
 
   # Connection Option
-  OPT_CONNECT_TIMEOUT         = 0
-  OPT_COMPRESS                = 1
-  OPT_NAMED_PIPE              = 2
-  INIT_COMMAND                = 3
-  READ_DEFAULT_FILE           = 4
-  READ_DEFAULT_GROUP          = 5
-  SET_CHARSET_DIR             = 6
-  SET_CHARSET_NAME            = 7
-  OPT_LOCAL_INFILE            = 8
-  OPT_PROTOCOL                = 9
-  SHARED_MEMORY_BASE_NAME     = 10
-  OPT_READ_TIMEOUT            = 11
-  OPT_WRITE_TIMEOUT           = 12
-  OPT_USE_RESULT              = 13
-  OPT_USE_REMOTE_CONNECTION   = 14
-  OPT_USE_EMBEDDED_CONNECTION = 15
-  OPT_GUESS_CONNECTION        = 16
-  SET_CLIENT_IP               = 17
-  SECURE_AUTH                 = 18
-  REPORT_DATA_TRUNCATION      = 19
-  OPT_RECONNECT               = 20
-  OPT_SSL_VERIFY_SERVER_CERT  = 21
+  OPT_CONNECT_TIMEOUT              = 0
+  OPT_COMPRESS                     = 1
+  OPT_NAMED_PIPE                   = 2
+  INIT_COMMAND                     = 3
+  READ_DEFAULT_FILE                = 4
+  READ_DEFAULT_GROUP               = 5
+  SET_CHARSET_DIR                  = 6
+  SET_CHARSET_NAME                 = 7
+  OPT_LOCAL_INFILE                 = 8
+  OPT_PROTOCOL                     = 9
+  SHARED_MEMORY_BASE_NAME          = 10
+  OPT_READ_TIMEOUT                 = 11
+  OPT_WRITE_TIMEOUT                = 12
+  OPT_USE_RESULT                   = 13
+  REPORT_DATA_TRUNCATION           = 14
+  OPT_RECONNECT                    = 15
+  PLUGIN_DIR                       = 16
+  DEFAULT_AUTH                     = 17
+  OPT_BIND                         = 18
+  OPT_SSL_KEY                      = 19
+  OPT_SSL_CERT                     = 20
+  OPT_SSL_CA                       = 21
+  OPT_SSL_CAPATH                   = 22
+  OPT_SSL_CIPHER                   = 23
+  OPT_SSL_CRL                      = 24
+  OPT_SSL_CRLPATH                  = 25
+  OPT_CONNECT_ATTR_RESET           = 26
+  OPT_CONNECT_ATTR_ADD             = 27
+  OPT_CONNECT_ATTR_DELETE          = 28
+  SERVER_PUBLIC_KEY                = 29
+  ENABLE_CLEARTEXT_PLUGIN          = 30
+  OPT_CAN_HANDLE_EXPIRED_PASSWORDS = 31
+  OPT_MAX_ALLOWED_PACKET           = 32
+  OPT_NET_BUFFER_LENGTH            = 33
+  OPT_TLS_VERSION                  = 34
+  OPT_SSL_MODE                     = 35
+  OPT_GET_SERVER_PUBLIC_KEY        = 36
+  OPT_RETRY_COUNT                  = 37
+  OPT_OPTIONAL_RESULTSET_METADATA  = 38
+  OPT_SSL_FIPS_MODE                = 39
+  OPT_TLS_CIPHERSUITES             = 40
+  OPT_COMPRESSION_ALGORITHMS       = 41
+  OPT_ZSTD_COMPRESSION_LEVEL       = 42
+  OPT_LOAD_DATA_LOCAL_DIR          = 43
 
   # Server Option
   OPTION_MULTI_STATEMENTS_ON  = 0
@@ -92,18 +130,36 @@ class Mysql
   SERVER_STATUS_LAST_ROW_SENT        = 1 << 7
   SERVER_STATUS_DB_DROPPED           = 1 << 8
   SERVER_STATUS_NO_BACKSLASH_ESCAPES = 1 << 9
+  SERVER_STATUS_METADATA_CHANGED     = 1 << 10
+  SERVER_QUERY_WAS_SLOW              = 1 << 11
+  SERVER_PS_OUT_PARAMS               = 1 << 12
+  SERVER_STATUS_IN_TRANS_READONLY    = 1 << 13
+  SERVER_SESSION_STATE_CHANGED       = 1 << 14
 
   # Refresh parameter
-  REFRESH_GRANT     = 1
-  REFRESH_LOG       = 1 << 1
-  REFRESH_TABLES    = 1 << 2
-  REFRESH_HOSTS     = 1 << 3
-  REFRESH_STATUS    = 1 << 4
-  REFRESH_THREADS   = 1 << 5
-  REFRESH_SLAVE     = 1 << 6
-  REFRESH_MASTER    = 1 << 7
-  REFRESH_READ_LOCK = 1 << 14
-  REFRESH_FAST      = 1 << 15
+  REFRESH_GRANT            = 1
+  REFRESH_LOG              = 1 << 1
+  REFRESH_TABLES           = 1 << 2
+  REFRESH_HOSTS            = 1 << 3
+  REFRESH_STATUS           = 1 << 4
+  REFRESH_THREADS          = 1 << 5
+  REFRESH_SLAVE            = 1 << 6
+  REFRESH_MASTER           = 1 << 7
+  REFRESH_ERROR_LOG        = 1 << 8
+  REFRESH_ENGINE_LOG       = 1 << 9
+  REFRESH_BINARY_LOG       = 1 << 10
+  REFRESH_RELAY_LOG        = 1 << 11
+  REFRESH_GENERAL_LOG      = 1 << 12
+  REFRESH_SLOW_LOG         = 1 << 13
+  REFRESH_READ_LOCK        = 1 << 14
+  REFRESH_FAST             = 1 << 15
+  REFRESH_QUERY_CACHE      = 1 << 16
+  REFRESH_QUERY_CACHE_FREE = 1 << 17
+  REFRESH_DES_KEY_FILE     = 1 << 18
+  REFRESH_USER_RESOURCES   = 1 << 19
+  REFRESH_FOR_EXPORT       = 1 << 20
+  REFRESH_OPTIMIZER_COSTS  = 1 << 21
+  REFRESH_PERSIST          = 1 << 22
 
   class Field
     # Field type
@@ -124,6 +180,13 @@ class Mysql
     TYPE_NEWDATE     = 14
     TYPE_VARCHAR     = 15
     TYPE_BIT         = 16
+    TYPE_TIMESTAMP2  = 17
+    TYPE_DATETIME2   = 18
+    TYPE_TIME2       = 19
+    TYPE_TYPED_ARRAY = 20
+    TYPE_INVALID     = 243
+    TYPE_BOOL        = 244
+    TYPE_JSON        = 245
     TYPE_NEWDECIMAL  = 246
     TYPE_ENUM        = 247
     TYPE_SET         = 248
@@ -138,28 +201,42 @@ class Mysql
     TYPE_INTERVAL    = TYPE_ENUM
 
     # Flag
-    NOT_NULL_FLAG       = 1
-    PRI_KEY_FLAG        = 2
-    UNIQUE_KEY_FLAG     = 4
-    MULTIPLE_KEY_FLAG   = 8
-    BLOB_FLAG           = 16
-    UNSIGNED_FLAG       = 32
-    ZEROFILL_FLAG       = 64
-    BINARY_FLAG         = 128
-    ENUM_FLAG           = 256
-    AUTO_INCREMENT_FLAG = 512
-    TIMESTAMP_FLAG      = 1024
-    SET_FLAG            = 2048
-    NUM_FLAG            = 32768
-    PART_KEY_FLAG       = 16384
-    GROUP_FLAG          = 32768
-    UNIQUE_FLAG         = 65536
-    BINCMP_FLAG         = 131072
+    NOT_NULL_FLAG                  = 1
+    PRI_KEY_FLAG                   = 2
+    UNIQUE_KEY_FLAG                = 4
+    MULTIPLE_KEY_FLAG              = 8
+    BLOB_FLAG                      = 16
+    UNSIGNED_FLAG                  = 32
+    ZEROFILL_FLAG                  = 64
+    BINARY_FLAG                    = 128
+    ENUM_FLAG                      = 256
+    AUTO_INCREMENT_FLAG            = 512
+    TIMESTAMP_FLAG                 = 1024
+    SET_FLAG                       = 2048
+    NO_DEFAULT_VALUE_FLAG          = 4096
+    ON_UPDATE_NOW_FLAG             = 8192
+    NUM_FLAG                       = 32768
+    PART_KEY_FLAG                  = 16384
+    GROUP_FLAG                     = 32768
+    UNIQUE_FLAG                    = 65536
+    BINCMP_FLAG                    = 131072
+    GET_FIXED_FIELDS_FLAG          = 1 << 18
+    FIELD_IN_PART_FUNC_FLAG        = 1 << 19
+    FIELD_IN_ADD_INDEX             = 1 << 20
+    FIELD_IS_RENAMED               = 1 << 21
+    FIELD_FLAGS_STORAGE_MEDIA_MASK = 3 << 22
+    FIELD_FLAGS_COLUMN_FORMAT_MASK = 3 << 24
+    FIELD_IS_DROPPED               = 1 << 26
+    EXPLICIT_NULL_FLAG             = 1 << 27
+    FIELD_IS_MARKED                = 1 << 28
+    NOT_SECONDARY_FLAG             = 1 << 29
   end
 
   class Stmt
     # Cursor type
-    CURSOR_TYPE_NO_CURSOR = 0
-    CURSOR_TYPE_READ_ONLY = 1
+    CURSOR_TYPE_NO_CURSOR  = 0
+    CURSOR_TYPE_READ_ONLY  = 1
+    CURSOR_TYPE_FOR_UPDATE = 2
+    CURSOR_TYPE_SCROLLABLE = 4
   end
 end

data/lib/mysql/error.rb

@@ -977,7 +977,16 @@ class Mysql
     CR_AUTH_PLUGIN_CANNOT_LOAD               = 2059
     CR_DUPLICATE_CONNECTION_ATTR             = 2060
     CR_AUTH_PLUGIN_ERR                       = 2061
-    CR_ERROR_LAST                            = 2061
+    CR_INSECURE_API_ERR                      = 2062
+    CR_FILE_NAME_TOO_LONG                    = 2063
+    CR_SSL_FIPS_MODE_ERR                     = 2064
+    CR_DEPRECATED_COMPRESSION_NOT_SUPPORTED  = 2065
+    CR_COMPRESSION_WRONGLY_CONFIGURED        = 2066
+    CR_KERBEROS_USER_NOT_FOUND               = 2067
+    CR_LOAD_DATA_LOCAL_INFILE_REJECTED       = 2068
+    CR_LOAD_DATA_LOCAL_INFILE_REALPATH_FAIL  = 2069
+    CR_DNS_SRV_LOOKUP_FAILED                 = 2070
+    CR_ERROR_LAST                            = 2070
   end
 
   ClientError.define_error_class(/\ACR_/)

data/lib/mysql/protocol.rb

@@ -1,5 +1,5 @@
 # coding: ascii-8bit
-# Copyright (C) 2008-2012 TOMITA Masahiro
+# Copyright (C) 2008 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 require "socket"
@@ -23,7 +23,7 @@ class Mysql
     # Object :: converted value.
     def self.net2value(pkt, type, unsigned)
       case type
-      when Field::TYPE_STRING, Field::TYPE_VAR_STRING, Field::TYPE_NEWDECIMAL, Field::TYPE_BLOB
+      when Field::TYPE_STRING, Field::TYPE_VAR_STRING, Field::TYPE_NEWDECIMAL, Field::TYPE_BLOB, Field::TYPE_JSON
         return pkt.lcs
       when Field::TYPE_TINY
         v = pkt.utiny
@@ -33,11 +33,11 @@ class Mysql
         return unsigned ? v : v < 32768 ? v : v-65536
       when Field::TYPE_INT24, Field::TYPE_LONG
         v = pkt.ulong
-        return unsigned ? v : v < 2**32/2 ? v : v-2**32
+        return unsigned ? v : v < 0x8000_0000 ? v : v-0x10000_0000
       when Field::TYPE_LONGLONG
         n1, n2 = pkt.ulong, pkt.ulong
         v = (n2 << 32) | n1
-        return unsigned ? v : v < 2**64/2 ? v : v-2**64
+        return unsigned ? v : v < 0x8000_0000_0000_0000 ? v : v-0x10000_0000_0000_0000
       when Field::TYPE_FLOAT
         return pkt.read(4).unpack('e').first
       when Field::TYPE_DOUBLE
@@ -79,38 +79,17 @@ class Mysql
         type = Field::TYPE_NULL
         val = ""
       when Integer
-        if v >= 0
-          if v < 256
-            type = Field::TYPE_TINY | 0x8000
-            val = [v].pack("C")
-          elsif v < 256**2
-            type = Field::TYPE_SHORT | 0x8000
-            val = [v].pack("v")
-          elsif v < 256**4
-            type = Field::TYPE_LONG | 0x8000
-            val = [v].pack("V")
-          elsif v < 256**8
-            type = Field::TYPE_LONGLONG | 0x8000
-            val = [v&0xffffffff, v>>32].pack("VV")
-          else
-            raise ProtocolError, "value too large: #{v}"
-          end
+        if -0x8000_0000 <= v && v < 0x8000_0000
+          type = Field::TYPE_LONG
+          val = [v].pack('V')
+        elsif -0x8000_0000_0000_0000 <= v && v < 0x8000_0000_0000_0000
+          type = Field::TYPE_LONGLONG
+          val = [v&0xffffffff, v>>32].pack("VV")
+        elsif 0x8000_0000_0000_0000 <= v && v <= 0xffff_ffff_ffff_ffff
+          type = Field::TYPE_LONGLONG | 0x8000
+          val = [v&0xffffffff, v>>32].pack("VV")
         else
-          if -v <= 256/2
-            type = Field::TYPE_TINY
-            val = [v].pack("C")
-          elsif -v <= 256**2/2
-            type = Field::TYPE_SHORT
-            val = [v].pack("v")
-          elsif -v <= 256**4/2
-            type = Field::TYPE_LONG
-            val = [v].pack("V")
-          elsif -v <= 256**8/2
-            type = Field::TYPE_LONGLONG
-            val = [v&0xffffffff, v>>32].pack("VV")
-          else
-            raise ProtocolError, "value too large: #{v}"
-          end
+          raise ProtocolError, "value too large: #{v}"
         end
       when Float
         type = Field::TYPE_DOUBLE
@@ -118,9 +97,12 @@ class Mysql
       when String
         type = Field::TYPE_STRING
         val = Packet.lcs(v)
-      when Mysql::Time, ::Time
+      when ::Time
+        type = Field::TYPE_DATETIME
+        val = [11, v.year, v.month, v.day, v.hour, v.min, v.sec, v.usec].pack("CvCCCCCV")
+      when Mysql::Time
         type = Field::TYPE_DATETIME
-        val = [7, v.year, v.month, v.day, v.hour, v.min, v.sec].pack("CvCCCCC")
+        val = [11, v.year, v.month, v.day, v.hour, v.min, v.sec, v.second_part].pack("CvCCCCCV")
       else
         raise ProtocolError, "class #{v.class} is not supported"
       end
@@ -152,15 +134,17 @@ class Mysql
     # conn_timeout :: [Integer] connect timeout (sec).
     # read_timeout :: [Integer] read timeout (sec).
     # write_timeout :: [Integer] write timeout (sec).
+    # local_infile :: [String] local infile path
     # === Exception
     # [ClientError] :: connection timeout
-    def initialize(host, port, socket, conn_timeout, read_timeout, write_timeout)
+    def initialize(host, port, socket, conn_timeout, read_timeout, write_timeout, local_infile)
       @insert_id = 0
       @warning_count = 0
       @gc_stmt_queue = []   # stmt id list which GC destroy.
       set_state :INIT
       @read_timeout = read_timeout
       @write_timeout = write_timeout
+      @local_infile = local_infile
       begin
         Timeout.timeout conn_timeout do
           if host.nil? or host.empty? or host == "localhost"
@@ -198,6 +182,7 @@ class Mysql
       @server_version = init_packet.server_version.split(/\D/)[0,3].inject{|a,b|a.to_i*100+b.to_i}
       @thread_id = init_packet.thread_id
       client_flags = CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION
+      client_flags |= CLIENT_LOCAL_FILES if @local_infile
       client_flags |= CLIENT_CONNECT_WITH_DB if db
       client_flags |= flag
       @charset = charset
@@ -248,10 +233,7 @@ class Mysql
           return res_packet.field_count
         end
         if res_packet.field_count.nil?      # LOAD DATA LOCAL INFILE
-          filename = res_packet.message
-          File.open(filename){|f| write f}
-          write nil  # EOF mark
-          read
+          send_local_file(res_packet.message)
         end
         @affected_rows, @insert_id, @server_status, @warning_count, @message =
           res_packet.affected_rows, res_packet.insert_id, res_packet.server_status, res_packet.warning_count, res_packet.message
@@ -263,6 +245,19 @@ class Mysql
       end
     end
 
+    # send local file to server
+    def send_local_file(filename)
+      filename = File.absolute_path(filename)
+      if filename.start_with? @local_infile
+        File.open(filename){|f| write f}
+      else
+        raise ClientError::LoadDataLocalInfileRejected, 'LOAD DATA LOCAL INFILE file request rejected due to restrictions on access.'
+      end
+    ensure
+      write nil # EOF mark
+      read
+    end
+
     # Retrieve n fields
     # === Argument
     # n :: [Integer] number of fields
@@ -488,7 +483,7 @@ class Mysql
     # === Exception
     # [ProtocolError] invalid packet sequence number
     def read
-      ret = ""
+      data = ''
       len = nil
       begin
         Timeout.timeout @read_timeout do
@@ -500,6 +495,7 @@ class Mysql
           @seq = (@seq + 1) % 256
           ret = @sock.read(len)
           raise EOFError unless ret && ret.length == len
+          data.concat ret
         end
       rescue EOFError
         raise ClientError::ServerGoneError, 'MySQL server has gone away'
@@ -510,18 +506,19 @@ class Mysql
       @sqlstate = "00000"
 
       # Error packet
-      if ret[0] == ?\xff
-        f, errno, marker, @sqlstate, message = ret.unpack("Cvaa5a*")
+      if data[0] == ?\xff
+        f, errno, marker, @sqlstate, message = data.unpack("Cvaa5a*")
         unless marker == "#"
-          f, errno, message = ret.unpack("Cva*")    # Version 4.0 Error
+          f, errno, message = data.unpack("Cva*")    # Version 4.0 Error
           @sqlstate = ""
         end
+        message.force_encoding(@charset.encoding)
         if Mysql::ServerError::ERROR_MAP.key? errno
           raise Mysql::ServerError::ERROR_MAP[errno].new(message, @sqlstate)
         end
         raise Mysql::ServerError.new(message, @sqlstate)
       end
-      Packet.new(ret)
+      Packet.new(data)
     end
 
     # Write one packet data
@@ -600,7 +597,7 @@ class Mysql
         server_capabilities = pkt.ushort
         server_charset = pkt.utiny
         server_status = pkt.ushort
-        f1 = pkt.read(13)
+        _f1 = pkt.read(13)
         rest_scramble_buff = pkt.string
         raise ProtocolError, "unsupported version: #{protocol_version}" unless protocol_version == VERSION
         raise ProtocolError, "invalid packet: f0=#{f0}" unless f0 == 0
@@ -643,13 +640,13 @@ class Mysql
     # Field packet
     class FieldPacket
       def self.parse(pkt)
-        first = pkt.lcs
+        _first = pkt.lcs
         db = pkt.lcs
         table = pkt.lcs
         org_table = pkt.lcs
         name = pkt.lcs
         org_name = pkt.lcs
-        f0 = pkt.utiny
+        _f0 = pkt.utiny
         charsetnr = pkt.ushort
         length = pkt.ulong
         type = pkt.utiny

data/lib/mysql.rb

@@ -1,5 +1,5 @@
 # coding: ascii-8bit
-# Copyright (C) 2008-2012 TOMITA Masahiro
+# Copyright (C) 2008 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 # MySQL connection class.
@@ -21,7 +21,7 @@ class Mysql
   rescue LoadError
   end
 
-  VERSION            = 20911               # Version number of this library
+  VERSION            = 21000               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -109,11 +109,11 @@ class Mysql
   # @return self
   def connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, socket=nil, flag=0)
     if flag & CLIENT_COMPRESS != 0
-      warn 'unsupported flag: CLIENT_COMPRESS'
+      warn 'unsupported flag: CLIENT_COMPRESS' if $VERBOSE
       flag &= ~CLIENT_COMPRESS
     end
-    @protocol = Protocol.new host, port, socket, @connect_timeout, @read_timeout, @write_timeout
-    @protocol.authenticate user, passwd, db, (@local_infile ? CLIENT_LOCAL_FILES : 0) | flag, @charset
+    @protocol = Protocol.new host, port, socket, @connect_timeout, @read_timeout, @write_timeout, @local_infile
+    @protocol.authenticate user, passwd, db, flag, @charset
     @charset ||= @protocol.charset
     @host_info = (host.nil? || host == "localhost") ? 'Localhost via UNIX socket' : "#{host} via TCP/IP"
     query @init_command if @init_command
@@ -158,6 +158,8 @@ class Mysql
       @connect_timeout = value
 #    when Mysql::GUESS_CONNECTION
     when Mysql::OPT_LOCAL_INFILE
+      @local_infile = value ? '' : nil
+    when Mysql::OPT_LOAD_DATA_LOCAL_DIR
       @local_infile = value
 #    when Mysql::OPT_NAMED_PIPE
 #    when Mysql::OPT_PROTOCOL
@@ -179,7 +181,7 @@ class Mysql
       @charset = Charset.by_name value.to_s
 #    when Mysql::SHARED_MEMORY_BASE_NAME
     else
-      warn "option not implemented: #{opt}"
+      warn "option not implemented: #{opt}" if $VERBOSE
     end
     self
   end
@@ -731,8 +733,8 @@ class Mysql
       max_length = Array.new(@fields.size, 0)
       @records.each_with_index do |rec, i|
         rec = @records[i] = rec.to_a if rec.is_a? RawRecord
-        max_length.each_index do |i|
-          max_length[i] = rec[i].length if rec[i] && rec[i].length > max_length[i]
+        max_length.each_index do |j|
+          max_length[j] = rec[j].length if rec[j] && rec[j].length > max_length[j]
         end
       end
       max_length.each_with_index do |len, i|