File tree Expand file tree Collapse file tree 6 files changed +8
-8
lines changed Expand file tree Collapse file tree 6 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ var CommandCode = require('../constants/commands.js');
4
4
var ClientConstants = require ( '../constants/client.js' ) ;
5
5
var Packet = require ( '../packets/packet.js' ) ;
6
6
var auth41 = require ( '../auth_41.js' ) ;
7
- var CharsetToEncoding = require ( './constants/charset_encodings.js' ) ;
7
+ var CharsetToEncoding = require ( '.. /constants/charset_encodings.js' ) ;
8
8
9
9
10
10
function ChangeUser ( opts )
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ var CursorType = require('../constants/cursor');
3
3
var CommandCodes = require ( '../constants/commands' ) ;
4
4
var Types = require ( '../constants/types' ) ;
5
5
var Packet = require ( '../packets/packet' ) ;
6
- var CharsetToEncoding = require ( './constants/charset_encodings.js' ) ;
6
+ var CharsetToEncoding = require ( '.. /constants/charset_encodings.js' ) ;
7
7
8
8
function Execute ( id , parameters , charsetNumber )
9
9
{
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ Handshake.fromPacket = function (packet)
16
16
{
17
17
var args = { } ;
18
18
args . protocolVersion = packet . readInt8 ( ) ;
19
- args . serverVersion = packet . readNullTerminatedString ( ) ;
19
+ args . serverVersion = packet . readNullTerminatedString ( 'cesu8' ) ;
20
20
args . connectionId = packet . readInt32 ( ) ;
21
21
args . authPluginData1 = packet . readBuffer ( 8 ) ;
22
22
packet . skip ( 1 ) ;
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ var Buffer = require('safe-buffer').Buffer;
2
2
3
3
var ClientConstants = require ( '../constants/client.js' ) ;
4
4
var Charsets = require ( '../constants/charsets.js' ) ;
5
- var CharsetToEncoding = require ( './constants/charset_encodings.js' ) ;
5
+ var CharsetToEncoding = require ( '.. /constants/charset_encodings.js' ) ;
6
6
var Packet = require ( '../packets/packet.js' ) ;
7
7
8
8
var auth41 = require ( '../auth_41.js' ) ;
@@ -42,7 +42,7 @@ HandshakeResponse.fromPacket = function (packet)
42
42
args . charsetNumber = packet . readInt8 ( ) ;
43
43
var encoding = CharsetToEncoding [ args . charsetNumber ] ;
44
44
packet . skip ( 23 ) ;
45
- args . user = packet . readNullTerminatedString ( ) ;
45
+ args . user = packet . readNullTerminatedString ( encoding ) ;
46
46
var authTokenLength ;
47
47
if ( isSet ( 'PLUGIN_AUTH_LENENC_CLIENT_DATA' ) ) {
48
48
authTokenLength = packet . readLengthCodedNumber ( encoding ) ;
@@ -83,7 +83,7 @@ HandshakeResponse.prototype.serializeResponse = function (buffer) {
83
83
packet . writeInt8 ( this . charsetNumber ) ;
84
84
packet . skip ( 23 ) ;
85
85
86
- var encoding = CharsetToEncoding [ args . charsetNumber ] ;
86
+ var encoding = CharsetToEncoding [ this . charsetNumber ] ;
87
87
packet . writeNullTerminatedString ( this . user , encoding ) ;
88
88
89
89
var authTokenLength , k ;
Original file line number Diff line number Diff line change @@ -688,7 +688,7 @@ Packet.lengthCodedNumberLength = function (n) {
688
688
} ;
689
689
690
690
Packet . lengthCodedStringLength = function ( str , encoding ) {
691
- var buf = StringParser . encode ( s , encoding ) ;
691
+ var buf = StringParser . encode ( str , encoding ) ;
692
692
var slen = buf . length ;
693
693
return Packet . lengthCodedNumberLength ( slen ) + slen ;
694
694
} ;
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ var Buffer = require('safe-buffer').Buffer;
2
2
var Packet = require ( '../packets/packet' ) ;
3
3
var CommandCodes = require ( '../constants/commands' ) ;
4
4
var StringParser = require ( '../parsers/string.js' ) ;
5
- var CharsetToEncoding = require ( './constants/charset_encodings.js' ) ;
5
+ var CharsetToEncoding = require ( '.. /constants/charset_encodings.js' ) ;
6
6
7
7
function PrepareStatement ( sql , charsetNumber )
8
8
{
You can’t perform that action at this time.
0 commit comments