Merge branch 'master' of git://github.com/mariano/node-db-mysql

Author: imkira

binding.gyp

@@ -0,0 +1,39 @@
+{
+  "targets": [
+    {
+      "target_name": "mysql_bindings",
+      'include_dirs': [
+              'lib/',
+              '.',
+              '<!@(mysql_config --include)'
+      ],
+      'cflags': [
+        '<!@(mysql_config --cflags)'
+      ],
+      'cflags!': [
+        '-fno-exceptions'
+      ],
+      'cflags_cc!': [
+        '-fno-exceptions'
+      ],
+      "sources": [ 
+        "lib/node-db/exception.cc",
+        "lib/node-db/binding.cc",
+        "lib/node-db/connection.cc",
+        "lib/node-db/events.cc",
+        "lib/node-db/query.cc",
+        "lib/node-db/result.cc",
+        "src/connection.cc",
+        "src/mysql.cc",
+        "src/query.cc",
+        "src/result.cc",
+        "src/mysql_bindings.cc"
+      ],
+      'link_settings': {
+          'libraries': [
+              '<!@(mysql_config --libs_r)'
+          ]
+      }
+    }
+  ]
+}

src/result.cc

@@ -79,6 +79,15 @@ node_db_mysql::Result::Result(MYSQL* connection) throw(node_db::Exception&)
     nextRow(NULL) {
     this->result = mysql_store_result(this->connection);
 
+    MYSQL_RES* tmp_result;
+    while (mysql_more_results(this->connection)) {
+        if (mysql_next_result(this->connection)) {
+            tmp_result = mysql_use_result(this->connection);
+            mysql_free_result(tmp_result);
+        }
+    }
+    tmp_result = NULL;
+
     try {
         if (result == NULL && mysql_field_count(this->connection) != 0) {
             throw node_db::Exception(mysql_error(this->connection));