mysqljs
diff --git a/‎lib/mysql/query.js
Copy file name to clipboardExpand all lines: lib/mysql/query.js
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/mysql/query.js
Copy file name to clipboardExpand all lines: lib/mysql/query.js
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎test/system/test-client-query.js
Copy file name to clipboardExpand all lines: test/system/test-client-query.js
+3-2Lines changed: 3 additions & 2 deletions b/‎test/system/test-client-query.js
Copy file name to clipboardExpand all lines: test/system/test-client-query.js
+3-2Lines changed: 3 additions & 2 deletions
@@ -67,7 +67,7 @@ Query.prototype._handlePacket = function(packet) {
 
         if (remaining == 0) {
           self._rowIndex++;
-          if (self.typeCast) {
+          if (self.typeCast && buffer !== null) {
             switch (field.fieldType) {
               case Query.FIELD_TYPE_TIMESTAMP:
               case Query.FIELD_TYPE_DATE:
 
@@ -47,7 +47,7 @@ client.query(
 var query = client.query(
   'INSERT INTO '+TEST_TABLE+' '+
   'SET title = ?, text = ?, created = ?',
-  ['another entry', 'because 2 entries make a better test', '2010-08-16 12:42:15']
+  ['another entry', 'because 2 entries make a better test', null]
 );
 
 query.on('end', gently.expect(function insertOkCb(packet) {
@@ -63,7 +63,8 @@ var query = client.query(
     assert.equal(results.length, 2);
     assert.equal(results[1].title, 'another entry');
     assert.ok(typeof results[1].id == 'number');
-    assert.ok(results[1].created instanceof Date);
+    assert.ok(results[0].created instanceof Date);
+    assert.strictEqual(results[1].created, null);
     client.end();
   })
 );