mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix logical error in STRBLK::SetValue

Browse source 
modified:
  storage/connect/valblk.cpp

- Fix compiler warning in ODBConn::GetCatInfo

modified:
  storage/connect/odbconn.cpp
This commit is contained in:
Olivier Bertrand 2013-12-16 17:40:42 +01:00
parent e2804d9b74
commit 18112a3f0c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/connect/odbconn.cpp
View file

@ -2135,7 +2135,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
SQLULEN crow;
PQRYRES qrp = cap->Qrp;
PCOLRES crp;
RETCODE rc;
RETCODE rc = 0;
HSTMT hstmt = NULL;
SQLLEN *vl, *vlen = NULL;
PVAL *pval = NULL;
@ -2199,6 +2199,8 @@ int ODBConn::GetCatInfo(CATPARM *cap)
break;
case CAT_SPC:
ThrowDBX("SQLSpecialColumns not available yet");
default:
ThrowDBX("Invalid SQL function id");
} // endswitch infotype
if (!Check(rc))

2
storage/connect/valblk.cpp
View file

@ -1052,7 +1052,7 @@ void STRBLK::SetValue(char *sp, uint len, int n)
memcpy(p, sp, len);
p[len] = 0;
} else
Strp[n] = Strp[n-1];
p = Strp[n-1];
} else
p = NULL;