Index: driver/info.c =================================================================== --- driver/info.c (revision 264) +++ driver/info.c (working copy) @@ -1303,7 +1303,7 @@ SQL_API_SQLNUMPARAMS, SQL_API_SQLPARAMOPTIONS, SQL_API_SQLPRIMARYKEYS, - SQL_API_SQLPROCEDURECOLUMNS, + /* SQL_API_SQLPROCEDURECOLUMNS, */ SQL_API_SQLPROCEDURES, SQL_API_SQLSETPOS, SQL_API_SQLSETSCROLLOPTIONS, Index: test/basics/my_basics.c =================================================================== --- test/basics/my_basics.c (revision 264) +++ test/basics/my_basics.c (working copy) @@ -1,27 +1,25 @@ -/*************************************************************************** - my_basics.c - description - --------------------- - begin : Wed Sep 8 2001 - copyright : (C) MySQL AB 1995-2002, www.mysql.com - author : venu ( venu@mysql.com ) - ***************************************************************************/ +/* + Copyright (C) 1995-2007 MySQL AB -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + This program is free software; you can redistribute it and/or modify + it under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. -/*************************************************************************** - * * - * This is a basic sample to demonstrate the basic execution of SQL * - * statements using MySQL ODBC 3.51 driver * - * * - ***************************************************************************/ + There are special exceptions to the terms and conditions of the GPL + as it is applied to this software. View the full text of the exception + in file LICENSE.exceptions in the top-level directory of this software + distribution. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "mytest3.h" /* MyODBC 3.51 sample utility header */ /******************************************************** @@ -119,13 +117,20 @@ rc = SQLFreeStmt(hstmt, SQL_CLOSE); mystmt(hstmt,rc); } -/******************************************************** -* main routine * -*********************************************************/ + + +void t_sqlgetfunctions(SQLHDBC hdbc, SQLHSTMT hstmt) +{ + SQLUSMALLINT supported= SQL_FALSE; + SQLRETURN rc= SQLGetFunctions(hdbc, SQL_API_SQLPROCEDURECOLUMNS, &supported); + my_assert(rc == SQL_FALSE); +} + + int main(int argc, char *argv[]) { SQLHENV henv; - SQLHDBC hdbc; + SQLHDBC hdbc; SQLHSTMT hstmt; SQLINTEGER narg; @@ -144,27 +149,19 @@ myuid = argv[2]; else if ( narg == 3 ) mypwd = argv[3]; - } + } - /* - * connect to MySQL server - */ - myconnect(&henv,&hdbc,&hstmt); + /* connect to MySQL server */ + myconnect(&henv,&hdbc,&hstmt); - /* - * simple execution of SQL statements - */ + /* simple execution of SQL statements */ my_basics(hdbc, hstmt); + t_sqlgetfunctions(hdbc, hstmt); - /* - * disconnect from the server, by freeing all resources - */ + /* disconnect from the server, by freeing all resources */ mydisconnect(&henv,&hdbc,&hstmt); printMessageFooter( 1 ); return(0); -} - - - +} Index: ChangeLog =================================================================== --- ChangeLog (revision 264) +++ ChangeLog (working copy) @@ -3,6 +3,8 @@ Functionality added or changed: Bugs fixed: + * SQLGetFunctions() reported that the driver supported SQLProcedureColumns(), + even though it does not. (Bug #27591) * SQLProcedures returned incomplete and incorrect information. (Bug #23033) * Statements that used "WHERE CURRENT OF" for positioned updates could not be re-executed or used with parameters that were provided using