From acdd726a29152c209d378e5bb28a47c7f201acaa Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 3 Mar 2011 08:19:07 +0100
Subject: [PATCH] fixed merge error

---
 lib/query.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/query.js b/lib/query.js
index 146d3eab..696137db 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -50,6 +50,7 @@ p.handleRowDescription = function(msg) {
   for(var i = 0; i < len; i++) {
     var field = msg.fields[i];
     var dataTypeId = field.dataTypeID;
+    var format = field.format;
     this._fieldNames[i] = field.name;
     switch(dataTypeId) {
     case 20: