fix serialization issues

Author: Andrey Sidorov

lib/packets/change_user.js

@@ -56,7 +56,7 @@ ChangeUser.prototype.serializeToBuffer = function (buffer)
   packet.writeInt16(this.charsetNumber);
 
   if (isSet('PLUGIN_AUTH')) {
-    packet.writeNullTerminatedString('mysql_native_password');
+    packet.writeNullTerminatedString('mysql_native_password', 'latin1');
   }
 
   if (isSet('CONNECT_ATTRS')) {

lib/packets/column_definition.js

@@ -101,13 +101,13 @@ ColumnDefinition.toPacket = function (column, sequenceId)
 {
   var length = 17; // = 4 padding + 1 + 12 for the rest
   fields.forEach(function (field) {
-    length += Packet.lengthCodedStringLength(column[field]);
+    length += Packet.lengthCodedStringLength(column[field], this.characterSet);
   });
 
   var buffer = Buffer.allocUnsafe(length);
 
   function writeField (name) {
-    packet.writeLengthCodedString(column[name]);
+    packet.writeLengthCodedString(column[name], this.characterSet);
   }
   var packet = new Packet(sequenceId, buffer, 0, length);
   packet.offset = 4;

lib/packets/handshake.js

@@ -61,7 +61,7 @@ Handshake.prototype.toPacket = function (sequenceId) {
   packet = new Packet(sequenceId, buffer, 0, length + 4);
   packet.offset = 4;
   packet.writeInt8(this.protocolVersion);
-  packet.writeString(this.serverVersion);
+  packet.writeString(this.serverVersion, 'cesu8');
   packet.writeInt8(0);
   packet.writeInt32(this.connectionId);
   packet.writeBuffer(this.authPluginData1);
@@ -74,7 +74,7 @@ Handshake.prototype.toPacket = function (sequenceId) {
   packet.skip(10);
   packet.writeBuffer(this.authPluginData2);
   packet.writeInt8(0);
-  packet.writeString('mysql_native_password');
+  packet.writeString('mysql_native_password', 'latin1');
   packet.writeInt8(0);
   return packet;
 };

lib/packets/handshake_response.js

@@ -101,7 +101,7 @@ HandshakeResponse.prototype.serializeResponse = function (buffer) {
   }
   if (isSet('PLUGIN_AUTH')) {
     // TODO: pass from config
-    packet.writeNullTerminatedString('mysql_native_password');
+    packet.writeNullTerminatedString('mysql_native_password', 'latin1');
   }
   if (isSet('CONNECT_ATTRS')) {
     var connectAttributes = this.connectAttributes || {};

lib/packets/packet.js

@@ -726,7 +726,8 @@ Packet.prototype.writeNull = function () {
 // TODO: refactor following three?
 Packet.prototype.writeNullTerminatedString = function (s, encoding) {
   var buf = StringParser.encode(s, encoding);
-  this.offset += buf.copy(this.buffer, this.offset);
+  buf.copy(this.buffer, this.offset);
+  this.offset += buf.length;
   this.writeInt8(0);
 };
 
@@ -746,19 +747,22 @@ Packet.prototype.writeString = function (s, encoding) {
   // this.offset += bytes;
 
   var buf = StringParser.encode(s, encoding);
-  this.offset += buf.copy(this.buffer, this.offset);
+  buf.copy(this.buffer, this.offset);
+  this.offset += buf.length;
 };
 
 Packet.prototype.writeLengthCodedString = function (s, encoding) {
+  console.log('writeLengthCodedString ', s, encoding);
   var buf = StringParser.encode(s, encoding);
   this.writeLengthCodedNumber(buf.length);
-  this.offset += buf.copy(this.buffer, this.offset);
+  buf.copy(this.buffer, this.offset);
+  this.offset += buf.lengh;
 };
 
 Packet.prototype.writeLengthCodedBuffer = function (b) {
   this.writeLengthCodedNumber(b.length);
-  b.copy(this.buffer, this.offset);
   this.offset += b.length;
+  b.copy(this.buffer, this.offset);
 };
 
 Packet.prototype.writeLengthCodedNumber = function (n) {

test/unit/packets/test-datetime.js

@@ -14,11 +14,11 @@ buf = Buffer.from('18000006000004666f6f310be00702090f01095d7f06000462617231', 'h
 packet = new packets.Packet(6, buf, 0, buf.length);
 
 i = packet.readInt16();
-var s = packet.readLengthCodedString();
+var s = packet.readLengthCodedString('cesu8');
 assert.equal(s, 'foo1');
 d = packet.readDateTime();
 assert.equal(+d, 1455030494821);
 
-var s1 = packet.readLengthCodedString();
+var s1 = packet.readLengthCodedString('cesu8');
 assert.equal(s1, 'bar1');
 assert.equal(packet.offset, packet.end);