database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- MySQL connection was not closed in case of error

Browse Source 
modified:
  storage/connect/myconn.cpp
This commit is contained in:
unknown
2013-03-02 00:09:15 +01:00
parent 63798ef4a5
commit 073b0e7731
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
storage/connect/myconn.cpp
View File

@@ -148,9 +148,10 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
/* Now get the results into blocks. */ /* Now get the results into blocks. */
/**********************************************************************/ /**********************************************************************/
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if ((rc = myc.Fetch(g, -1) == RC_FX)) if ((rc = myc.Fetch(g, -1) == RC_FX)) {
myc.Close();
return NULL; return NULL;
else if (rc == RC_NF) } else if (rc == RC_NF)
break; break;
// Get column name // Get column name
@@ -165,12 +166,14 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
if ((nf = sscanf(fld, "%[^(](%d,%d", cmd, &len, &prec)) < 1) { if ((nf = sscanf(fld, "%[^(](%d,%d", cmd, &len, &prec)) < 1) {
sprintf(g->Message, MSG(BAD_FIELD_TYPE), fld); sprintf(g->Message, MSG(BAD_FIELD_TYPE), fld);
myc.Close();
return NULL; return NULL;
} else } else
qrp->Nblin++; qrp->Nblin++;
if ((type = MYSQLtoPLG(cmd)) == TYPE_ERROR) { if ((type = MYSQLtoPLG(cmd)) == TYPE_ERROR) {
sprintf(g->Message, "Unsupported column type %s", cmd); sprintf(g->Message, "Unsupported column type %s", cmd);
myc.Close();
return NULL; return NULL;
} // endif type } // endif type