@@ -251,12 +251,6 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error {
251
251
// SSL Connection Request Packet
252
252
// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::SSLRequest
253
253
if mc .cfg .tls != nil {
254
- // Packet header [24bit length + 1 byte sequence]
255
- data [0 ] = byte ((4 + 4 + 1 + 23 ))
256
- data [1 ] = byte ((4 + 4 + 1 + 23 ) >> 8 )
257
- data [2 ] = byte ((4 + 4 + 1 + 23 ) >> 16 )
258
- data [3 ] = mc .sequence
259
-
260
254
// Send TLS / SSL request packet
261
255
if err := mc .writePacket (data [:(4 + 4 + 1 + 23 )+ 4 ]); err != nil {
262
256
return err
@@ -271,12 +265,6 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error {
271
265
mc .buf .rd = tlsConn
272
266
}
273
267
274
- // Add the packet header [24bit length + 1 byte sequence]
275
- data [0 ] = byte (pktLen )
276
- data [1 ] = byte (pktLen >> 8 )
277
- data [2 ] = byte (pktLen >> 16 )
278
- data [3 ] = mc .sequence
279
-
280
268
// Filler [23 bytes] (all 0x00)
281
269
pos := 13 + 23
282
270
@@ -316,12 +304,6 @@ func (mc *mysqlConn) writeOldAuthPacket(cipher []byte) error {
316
304
return driver .ErrBadConn
317
305
}
318
306
319
- // Add the packet header [24bit length + 1 byte sequence]
320
- data [0 ] = byte (pktLen )
321
- data [1 ] = byte (pktLen >> 8 )
322
- data [2 ] = byte (pktLen >> 16 )
323
- data [3 ] = mc .sequence
324
-
325
307
// Add the scrambled password [null terminated string]
326
308
copy (data [4 :], scrambleBuff )
327
309
@@ -343,12 +325,6 @@ func (mc *mysqlConn) writeCommandPacket(command byte) error {
343
325
return driver .ErrBadConn
344
326
}
345
327
346
- // Add the packet header [24bit length + 1 byte sequence]
347
- data [0 ] = 0x01 // 1 byte long
348
- data [1 ] = 0x00
349
- data [2 ] = 0x00
350
- data [3 ] = 0x00 // new command, sequence id is always 0
351
-
352
328
// Add command byte
353
329
data [4 ] = command
354
330
@@ -368,12 +344,6 @@ func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {
368
344
return driver .ErrBadConn
369
345
}
370
346
371
- // Add the packet header [24bit length + 1 byte sequence]
372
- data [0 ] = byte (pktLen )
373
- data [1 ] = byte (pktLen >> 8 )
374
- data [2 ] = byte (pktLen >> 16 )
375
- data [3 ] = 0x00 // new command, sequence id is always 0
376
-
377
347
// Add command byte
378
348
data [4 ] = command
379
349
@@ -395,12 +365,6 @@ func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error {
395
365
return driver .ErrBadConn
396
366
}
397
367
398
- // Add the packet header [24bit length + 1 byte sequence]
399
- data [0 ] = 0x05 // 5 bytes long
400
- data [1 ] = 0x00
401
- data [2 ] = 0x00
402
- data [3 ] = 0x00 // new command, sequence id is always 0
403
-
404
368
// Add command byte
405
369
data [4 ] = command
406
370
@@ -735,12 +699,6 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {
735
699
}
736
700
737
701
stmt .mc .sequence = 0
738
- // Add the packet header [24bit length + 1 byte sequence]
739
- data [0 ] = byte (pktLen )
740
- data [1 ] = byte (pktLen >> 8 )
741
- data [2 ] = byte (pktLen >> 16 )
742
- data [3 ] = 0x00 // mc.sequence
743
-
744
702
// Add command byte [1 byte]
745
703
data [4 ] = comStmtSendLongData
746
704
@@ -971,14 +929,6 @@ func (stmt *mysqlStmt) writeExecutePacket(args []driver.Value) error {
971
929
pos += len (paramValues )
972
930
data = data [:pos ]
973
931
974
- pktLen := pos - 4
975
-
976
- // packet header [4 bytes]
977
- data [0 ] = byte (pktLen )
978
- data [1 ] = byte (pktLen >> 8 )
979
- data [2 ] = byte (pktLen >> 16 )
980
- data [3 ] = mc .sequence
981
-
982
932
// Convert nullMask to bytes
983
933
for i , max := 0 , (stmt .paramCount + 7 )>> 3 ; i < max ; i ++ {
984
934
data [i + 14 ] = byte (nullMask >> uint (i << 3 ))
0 commit comments