Connector/ODBC 3.51 commit: r714 - branches/guffert/test

[jwinstead]

Modified:
   branches/guffert/test/odbctap.h
Log:
Merged revisions 710-713 via svnmerge from 
svn+ssh://bk-internal/connectors-svnroot/connector-odbc3/trunk

.......
  r713 | jwinstead | 2007-08-29 14:32:17 -0700 (Wed, 29 Aug 2007) | 2 lines
  
  Fix some incorrect buffer sizes (in tests)
.......


Modified: branches/guffert/test/odbctap.h
===================================================================
--- branches/guffert/test/odbctap.h	2007-08-29 21:32:17 UTC (rev 713)
+++ branches/guffert/test/odbctap.h	2007-08-29 22:07:22 UTC (rev 714)
@@ -623,7 +623,7 @@
     SQLRETURN   rc;
     SQLUINTEGER nRowCount=0;
     SQLULEN     pcColDef;
-    SQLCHAR     szColName[MAX_NAME_LEN];
+    SQLCHAR     szColName[MAX_NAME_LEN+1];
     SQLCHAR     szData[MAX_COLUMNS][MAX_ROW_DATA_LEN]={{0}};
     SQLSMALLINT nIndex,ncol,pfSqlType, pcbScale, pfNullable;
 
@@ -632,7 +632,7 @@
 
     for (nIndex = 1; nIndex <= ncol; nIndex++)
     {
-        rc = SQLDescribeCol(hstmt,nIndex,szColName, MAX_NAME_LEN+1, NULL,
+        rc = SQLDescribeCol(hstmt,nIndex,szColName, MAX_NAME_LEN, NULL,
                             &pfSqlType,&pcColDef,&pcbScale,&pfNullable);
         mystmt(hstmt,rc);
 
@@ -845,7 +845,7 @@
 */
 int mysql_min_version(SQLHDBC hdbc, char *min_version, unsigned int length)
 {
-    SQLCHAR server_version[MYSQL_NAME_LEN];
+    SQLCHAR server_version[MYSQL_NAME_LEN+1];
     SQLRETURN rc;
 
     rc = SQLGetInfo(hdbc,SQL_DBMS_VER,server_version,MYSQL_NAME_LEN,NULL);
@@ -879,7 +879,7 @@
 */
 int mydrvconnect(SQLHENV *henv, SQLHDBC *hdbc, SQLHSTMT *hstmt, SQLCHAR *connIn)
 {
-  SQLCHAR   connOut[MAX_NAME_LEN];
+  SQLCHAR   connOut[MAX_NAME_LEN+1];
   SQLSMALLINT len;
 
   ok_env(*henv, SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, henv));
@@ -889,7 +889,7 @@
 
   ok_env(*henv, SQLAllocHandle(SQL_HANDLE_DBC, *henv,  hdbc));
 
-  ok_con(*hdbc, SQLDriverConnect(*hdbc, NULL, connIn, MAX_NAME_LEN, connOut,
+  ok_con(*hdbc, SQLDriverConnect(*hdbc, NULL, connIn, SQL_NTS, connOut,
                                  MAX_NAME_LEN, &len, SQL_DRIVER_NOPROMPT));
 
   ok_con(*hdbc, SQLSetConnectAttr(*hdbc, SQL_ATTR_AUTOCOMMIT,
@@ -903,7 +903,7 @@
 
 int alloc_basic_handles(SQLHENV *henv, SQLHDBC *hdbc, SQLHSTMT *hstmt)
 {
-  SQLCHAR   connIn[MAX_NAME_LEN], connOut[MAX_NAME_LEN];
+  SQLCHAR   connIn[MAX_NAME_LEN+1], connOut[MAX_NAME_LEN+1];
   SQLSMALLINT len;
 
   ok_env(*henv, SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, henv));
@@ -921,7 +921,7 @@
     strcat((char *)connIn, (char *)mysock);
   }
 
-  ok_con(*hdbc, SQLDriverConnect(*hdbc, NULL, connIn, MAX_NAME_LEN, connOut,
+  ok_con(*hdbc, SQLDriverConnect(*hdbc, NULL, connIn, SQL_NTS, connOut,
                                  MAX_NAME_LEN, &len, SQL_DRIVER_NOPROMPT));
 
   ok_con(*hdbc, SQLSetConnectAttr(*hdbc, SQL_ATTR_AUTOCOMMIT,