Connector/ODBC 3.51 commit: r713 - trunk/test

[jwinstead]

Modified:
   trunk/test/odbctap.h
Log:
Fix some incorrect buffer sizes (in tests)


Modified: trunk/test/odbctap.h
===================================================================
--- trunk/test/odbctap.h	2007-08-29 20:13:23 UTC (rev 712)
+++ trunk/test/odbctap.h	2007-08-29 21:32:17 UTC (rev 713)
@@ -591,7 +591,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;
 
@@ -600,7 +600,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);
 
@@ -787,7 +787,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;
 
     if (!server_is_mysql(hdbc))
@@ -824,7 +824,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));
@@ -834,7 +834,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,
@@ -848,7 +848,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));
@@ -866,7 +866,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,