Skip to content

Commit ebc0bcb

Browse files
author
Andrey Sidorov
committed
fix path errors
1 parent b7933df commit ebc0bcb

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

lib/packets/change_user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var CommandCode = require('../constants/commands.js');
44
var ClientConstants = require('../constants/client.js');
55
var Packet = require('../packets/packet.js');
66
var auth41 = require('../auth_41.js');
7-
var CharsetToEncoding = require('./constants/charset_encodings.js');
7+
var CharsetToEncoding = require('../constants/charset_encodings.js');
88

99

1010
function ChangeUser (opts)

lib/packets/execute.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var CursorType = require('../constants/cursor');
33
var CommandCodes = require('../constants/commands');
44
var Types = require('../constants/types');
55
var Packet = require('../packets/packet');
6-
var CharsetToEncoding = require('./constants/charset_encodings.js');
6+
var CharsetToEncoding = require('../constants/charset_encodings.js');
77

88
function Execute (id, parameters, charsetNumber)
99
{

lib/packets/handshake.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Handshake.fromPacket = function (packet)
1616
{
1717
var args = {};
1818
args.protocolVersion = packet.readInt8();
19-
args.serverVersion = packet.readNullTerminatedString();
19+
args.serverVersion = packet.readNullTerminatedString('cesu8');
2020
args.connectionId = packet.readInt32();
2121
args.authPluginData1 = packet.readBuffer(8);
2222
packet.skip(1);

lib/packets/handshake_response.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var Buffer = require('safe-buffer').Buffer;
22

33
var ClientConstants = require('../constants/client.js');
44
var Charsets = require('../constants/charsets.js');
5-
var CharsetToEncoding = require('./constants/charset_encodings.js');
5+
var CharsetToEncoding = require('../constants/charset_encodings.js');
66
var Packet = require('../packets/packet.js');
77

88
var auth41 = require('../auth_41.js');
@@ -42,7 +42,7 @@ HandshakeResponse.fromPacket = function (packet)
4242
args.charsetNumber = packet.readInt8();
4343
var encoding = CharsetToEncoding[args.charsetNumber];
4444
packet.skip(23);
45-
args.user = packet.readNullTerminatedString();
45+
args.user = packet.readNullTerminatedString(encoding);
4646
var authTokenLength;
4747
if (isSet('PLUGIN_AUTH_LENENC_CLIENT_DATA')) {
4848
authTokenLength = packet.readLengthCodedNumber(encoding);
@@ -83,7 +83,7 @@ HandshakeResponse.prototype.serializeResponse = function (buffer) {
8383
packet.writeInt8(this.charsetNumber);
8484
packet.skip(23);
8585

86-
var encoding = CharsetToEncoding[args.charsetNumber];
86+
var encoding = CharsetToEncoding[this.charsetNumber];
8787
packet.writeNullTerminatedString(this.user, encoding);
8888

8989
var authTokenLength, k;

lib/packets/packet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ Packet.lengthCodedNumberLength = function (n) {
688688
};
689689

690690
Packet.lengthCodedStringLength = function (str, encoding) {
691-
var buf = StringParser.encode(s, encoding);
691+
var buf = StringParser.encode(str, encoding);
692692
var slen = buf.length;
693693
return Packet.lengthCodedNumberLength(slen) + slen;
694694
};

lib/packets/prepare_statement.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var Buffer = require('safe-buffer').Buffer;
22
var Packet = require('../packets/packet');
33
var CommandCodes = require('../constants/commands');
44
var StringParser = require('../parsers/string.js');
5-
var CharsetToEncoding = require('./constants/charset_encodings.js');
5+
var CharsetToEncoding = require('../constants/charset_encodings.js');
66

77
function PrepareStatement (sql, charsetNumber)
88
{

0 commit comments

Comments
 (0)