[prev in list] [next in list] [prev in thread] [next in thread]
List: mysql-odbc
Subject: bk commit - MyODBC 3.51 (1.483)
From: pharvey () mysql ! com
Date: 2005-08-06 5:02:59
Message-ID: 20050806050259.22BEB73895 () peter-harveys-power-mac-g5 ! local
[Download RAW message or body]
Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository.
For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_source
You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset : http://mysql.bkbits.net:8080/myodbc3/cset@1.483
ChangeSet
1.483 05/08/05 22:02:57 pharvey@peter-harveys-power-mac-g5.local +14 -0
slickedit project file reorg
some tweeks for osx
myodbc-3.51.vpw
1.2 05/08/05 22:02:57 pharvey@peter-harveys-power-mac-g5.local +1 -6
slickedit project file reorg
some tweeks for osx
driver/utility.c
1.52 05/08/05 22:02:57 pharvey@peter-harveys-power-mac-g5.local +3 -0
slickedit project file reorg
some tweeks for osx
driver/cursor.c
1.82 05/08/05 22:02:57 pharvey@peter-harveys-power-mac-g5.local +22 -15
slickedit project file reorg
some tweeks for osx
driver/catalog.c
1.45 05/08/05 22:02:56 pharvey@peter-harveys-power-mac-g5.local +26 -32
slickedit project file reorg
some tweeks for osx
README.osx
1.4 05/08/05 22:02:56 pharvey@peter-harveys-power-mac-g5.local +12 -2
slickedit project file reorg
some tweeks for osx
MYODBCConfig/main.cpp
1.10 05/08/05 22:02:56 pharvey@peter-harveys-power-mac-g5.local +1 -1
slickedit project file reorg
some tweeks for osx
MYODBCConfig/main.cpp.alternative
1.2 05/08/05 22:02:56 pharvey@peter-harveys-power-mac-g5.local +1 -1
slickedit project file reorg
some tweeks for osx
root.vpj
1.1 05/08/05 21:59:53 pharvey@peter-harveys-power-mac-g5.local +81 -0
root.vpj
1.0 05/08/05 21:59:53 pharvey@peter-harveys-power-mac-g5.local +0 -0
BitKeeper file /Users/pharvey/SandBox/MySQL/myodbc-3.51/root.vpj
BitKeeper/deleted/.del-myodbc-3.51-util.vpj~3ef45ae133d89659
1.6 05/08/05 20:28:37 pharvey@peter-harveys-power-mac-g5.local +0 -0
Delete: util/myodbc-3.51-util.vpj
BitKeeper/deleted/.del-myodbc-3.51-setup.vpj~5ef09b0dd275021d
1.4 05/08/05 20:28:22 pharvey@peter-harveys-power-mac-g5.local +0 -0
Delete: setup/myodbc-3.51-setup.vpj
BitKeeper/deleted/.del-myodbc-3.51-myodbcinst.vpj~96123a7c2853f333
1.4 05/08/05 20:28:09 pharvey@peter-harveys-power-mac-g5.local +0 -0
Delete: myodbcinst/myodbc-3.51-myodbcinst.vpj
BitKeeper/deleted/.del-myodbc-3.51-MYODBCConfig.vpj~557fd83772edd914
1.3 05/08/05 20:27:52 pharvey@peter-harveys-power-mac-g5.local +0 -0
Delete: MYODBCConfig/myodbc-3.51-MYODBCConfig.vpj
BitKeeper/deleted/.del-myodbc-3.51-imyodbc.vpj~a566b304b37cfee
1.3 05/08/05 20:27:36 pharvey@peter-harveys-power-mac-g5.local +0 -0
Delete: imyodbc/myodbc-3.51-imyodbc.vpj
BitKeeper/deleted/.del-myodbc-3.51.vpj~b101270ab87a3f53
1.9 05/08/05 20:27:09 pharvey@peter-harveys-power-mac-g5.local +0 -0
Delete: myodbc-3.51.vpj
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: pharvey
# Host: peter-harveys-power-mac-g5.local
# Root: /Users/pharvey/SandBox/MySQL/myodbc-3.51
--- 1.81/driver/cursor.c 2005-08-03 10:20:29 -07:00
+++ 1.82/driver/cursor.c 2005-08-05 22:02:57 -07:00
@@ -414,10 +414,12 @@
/* Copy row buffer data to statement */
param.used= 1;
- param.SqlType= unireg_to_sql_datatype(stmt,field,0,
- &transfer_length,
- &precision,
- &display_size);
+ param.SqlType= unireg_to_sql_datatype( stmt,
+ field,
+ 0,
+ &transfer_length,
+ &precision,
+ &display_size );
param.CType= SQL_C_CHAR;
if (row_data && *row_data)
@@ -721,10 +723,10 @@
static SQLRETURN build_set_clause(STMT FAR *stmt, SQLUINTEGER irow,
DYNAMIC_STRING *dynQuery)
{
- PARAM_BIND param;
- SQLUINTEGER transfer_length,precision,display_size;
- SQLINTEGER length;
- uint ncol, ignore_count= 0;
+ PARAM_BIND param;
+ ulong transfer_length,precision,display_size;
+ SQLINTEGER length;
+ uint ncol, ignore_count= 0;
MYSQL_FIELD *field;
MYSQL_RES *result= stmt->result;
BIND *bind;
@@ -779,9 +781,11 @@
dynstr_append_mem(dynQuery,"=",1);
param.used= 1;
- param.SqlType= unireg_to_sql_datatype(stmt,field,0,
- &transfer_length,&precision,
- &display_size);
+ param.SqlType= unireg_to_sql_datatype( stmt,field,
+ 0,
+ &transfer_length,
+ &precision,
+ &display_size );
param.CType= bind->fCType;
param.buffer= (gptr) bind->rgbValue+irow*bind->cbValueMax;
param.ValueMax= bind->cbValueMax;
@@ -1054,15 +1058,18 @@
dynstr_append_mem(ext_query,"(", 1);
for (ncol= 0; ncol < result->field_count; ncol++)
{
- SQLUINTEGER transfer_length,precision,display_size;
+ ulong transfer_length,precision,display_size;
MYSQL_FIELD *field= mysql_fetch_field_direct(result,ncol);
BIND *bind= stmt->bind+ncol;
- param.SqlType= unireg_to_sql_datatype(stmt,field,0,
- &transfer_length,&precision,
+ param.SqlType= unireg_to_sql_datatype(stmt,
+ field,
+ 0,
+ &transfer_length,
+ &precision,
&display_size);
param.CType = bind->fCType;
- param.buffer= (gptr) bind->rgbValue+count*(stmt->stmt_options.bind_type);
+ param.buffer= (gptr) \
bind->rgbValue+count*(stmt->stmt_options.bind_type);
if ( !( bind->pcbValue && ( *bind->pcbValue == SQL_COLUMN_IGNORE ) ) \
) {
--- 1.44/driver/catalog.c 2005-04-06 11:27:09 -07:00
+++ 1.45/driver/catalog.c 2005-08-05 22:02:56 -07:00
@@ -83,13 +83,13 @@
@purpose : gets valid input buffer
*/
-static char *myodbc_get_valid_buffer(char *to, char *from, int length)
+static char *myodbc_get_valid_buffer( SQLCHAR *to, SQLCHAR *from, int length)
{
if (!from)
return "\0";
if (length == SQL_NTS)
length= strlen(from);
- strmake(to,from,length);
+ strmake( to, from, length );
return to;
}
@@ -292,10 +292,9 @@
CLEAR_STMT_ERROR(hstmt);
my_SQLFreeStmt(hstmt,MYSQL_RESET);
- TableQualifier= myodbc_get_valid_buffer((char FAR *) \
Qualifier_buff,szTableQualifier,
- cbTableQualifier);
- TableOwner= myodbc_get_valid_buffer((char FAR*) \
Owner_buff,szTableOwner,cbTableOwner);
- TableName= myodbc_get_valid_buffer((char FAR*) \
Name_buff,szTableName,cbTableName); + TableQualifier= myodbc_get_valid_buffer( \
Qualifier_buff, szTableQualifier, cbTableQualifier ); + TableOwner= \
myodbc_get_valid_buffer( Owner_buff, szTableOwner, cbTableOwner ); + TableName= \
myodbc_get_valid_buffer( Name_buff, szTableName, cbTableName );
escape_input_parameter(&stmt->dbc->mysql, TableQualifier);
escape_input_parameter(&stmt->dbc->mysql, TableOwner);
@@ -347,7 +346,7 @@
DBUG_RETURN_STATUS(SQL_SUCCESS);
}
- TableType= myodbc_get_valid_buffer((char FAR*) \
Type_buff,szTableType,cbTableType); + TableType= myodbc_get_valid_buffer( \
Type_buff, szTableType, cbTableType );
if (!TableQualifier[0] && !TableOwner[0] && !TableName[0] &&
(!strcmp(TableType,"%") ||
@@ -728,9 +727,9 @@
szTableName ? (char*) szTableName : "null", cbTableName,
szColumnName ? (char*) szColumnName : "null", cbColumnName));
- TableQualifier= myodbc_get_valid_buffer((char *) Qualifier_buff, szTableQualifier, \
cbTableQualifier);
- TableName= myodbc_get_valid_buffer((char *) Table_buff, szTableName, \
cbTableName);
- ColumnName= myodbc_get_valid_buffer((char *) Column_buff, szColumnName, \
cbColumnName); + TableQualifier= myodbc_get_valid_buffer( Qualifier_buff, \
szTableQualifier, cbTableQualifier ); + TableName= myodbc_get_valid_buffer( \
Table_buff, szTableName, cbTableName ); + ColumnName= myodbc_get_valid_buffer( \
Column_buff, szColumnName, cbColumnName );
CLEAR_STMT_ERROR(hstmt);
my_SQLFreeStmt(hstmt,MYSQL_RESET);
@@ -972,8 +971,8 @@
szTableName ? (char*) szTableName : "null", cbTableName,
fUnique, fAccuracy));
- TableQualifier= myodbc_get_valid_buffer((char *) Qualifier_buff, szTableQualifier, \
cbTableQualifier);
- TableName= myodbc_get_valid_buffer((char *) Table_buff, szTableName, \
cbTableName); + TableQualifier= myodbc_get_valid_buffer( Qualifier_buff, \
szTableQualifier, cbTableQualifier ); + TableName= myodbc_get_valid_buffer( \
Table_buff, szTableName, cbTableName );
CLEAR_STMT_ERROR(hstmt);
my_SQLFreeStmt(hstmt,MYSQL_RESET);
@@ -1164,9 +1163,8 @@
szTableOwner ? (char*) szTableOwner : "null",
szTableName ? (char*) szTableName : "null"));
- TableQualifier= myodbc_get_valid_buffer((char FAR *) \
Qualifier_buff,szTableQualifier,
- cbTableQualifier);
- TableName= myodbc_get_valid_buffer((char FAR*) Name_buff,szTableName,cbTableName);
+ TableQualifier= myodbc_get_valid_buffer( Qualifier_buff, szTableQualifier, \
cbTableQualifier ); + TableName= myodbc_get_valid_buffer( Name_buff, szTableName, \
cbTableName );
escape_input_parameter(&stmt->dbc->mysql, TableQualifier);
escape_input_parameter(&stmt->dbc->mysql, TableName);
@@ -1339,10 +1337,9 @@
szTableName ? (char*) szTableName : "null",
szColumnName ? (char*) szColumnName : "null"));
- TableQualifier=myodbc_get_valid_buffer((char FAR *) \
Qualifier_buff,szTableQualifier,
- cbTableQualifier);
- TableName= myodbc_get_valid_buffer((char FAR*) \
Table_buff,szTableName,cbTableName);
- ColumnName= myodbc_get_valid_buffer((char FAR*) \
Column_buff,szColumnName,cbColumnName); + TableQualifier=myodbc_get_valid_buffer( \
Qualifier_buff, szTableQualifier, cbTableQualifier ); + TableName= \
myodbc_get_valid_buffer( Table_buff, szTableName, cbTableName ); + ColumnName= \
myodbc_get_valid_buffer( Column_buff, szColumnName, cbColumnName );
escape_input_parameter(&stmt->dbc->mysql, TableQualifier);
escape_input_parameter(&stmt->dbc->mysql, TableName);
@@ -1492,9 +1489,8 @@
szTableName ? (char*) szTableName : "null",
fScope, fNullable));
- TableQualifier=myodbc_get_valid_buffer((char FAR *) \
Qualifier_buff,szTableQualifier,
- cbTableQualifier);
- TableName= myodbc_get_valid_buffer((char FAR*) \
Table_buff,szTableName,cbTableName); + TableQualifier=myodbc_get_valid_buffer( \
Qualifier_buff, szTableQualifier, cbTableQualifier ); + TableName= \
myodbc_get_valid_buffer( Table_buff, szTableName, cbTableName );
escape_input_parameter(&stmt->dbc->mysql, TableQualifier);
escape_input_parameter(&stmt->dbc->mysql, TableName);
@@ -1699,8 +1695,8 @@
szTableOwner ? (char*) szTableOwner : "null", cbTableOwner,
szTableName ? (char*) szTableName : "null", cbTableName));
- TableQualifier= myodbc_get_valid_buffer((char FAR *) \
Qualifier_buff,szTableQualifier, cbTableQualifier);
- TableName= myodbc_get_valid_buffer((char FAR*) \
Table_buff,szTableName,cbTableName); + TableQualifier= myodbc_get_valid_buffer( \
Qualifier_buff, szTableQualifier, cbTableQualifier ); + TableName= \
myodbc_get_valid_buffer( Table_buff, szTableName, cbTableName );
escape_input_parameter(&stmt->dbc->mysql, TableQualifier);
escape_input_parameter(&stmt->dbc->mysql, TableName);
@@ -1878,12 +1874,10 @@
*FkTableQualifier,*FkTableName;
uint comment_id;
- PkTableQualifier= myodbc_get_valid_buffer((char FAR \
*)PkQualifier_buff,szPkTableQualifier,
- cbPkTableQualifier);
- PkTableName= myodbc_get_valid_buffer((char FAR*) \
PkName_buff,szPkTableName,cbPkTableName);
- FkTableQualifier= myodbc_get_valid_buffer((char FAR \
*)FkQualifier_buff,szFkTableQualifier,
- cbFkTableQualifier);
- FkTableName= myodbc_get_valid_buffer((char \
FAR*)FkName_buff,szFkTableName,cbFkTableName); + PkTableQualifier= \
myodbc_get_valid_buffer( PkQualifier_buff, szPkTableQualifier, cbPkTableQualifier ); \
+ PkTableName= myodbc_get_valid_buffer( PkName_buff, szPkTableName, cbPkTableName \
); + FkTableQualifier= myodbc_get_valid_buffer( FkQualifier_buff, \
szFkTableQualifier, cbFkTableQualifier ); + FkTableName= myodbc_get_valid_buffer( \
FkName_buff, szFkTableName, cbFkTableName );
if (FkTableQualifier && !FkTableQualifier[0])
FkTableQualifier= stmt->dbc->database;
@@ -2119,8 +2113,8 @@
}
my_SQLFreeStmt(hstmt,MYSQL_RESET);
- ProcQualifier= myodbc_get_valid_buffer((char FAR \
*)Qualifier_buff,szProcQualifier,cbProcQualifier);
- ProcName= myodbc_get_valid_buffer((char FAR*)Name_buff,szProcName,cbProcName);
+ ProcQualifier= myodbc_get_valid_buffer( Qualifier_buff, szProcQualifier, \
cbProcQualifier ); + ProcName= myodbc_get_valid_buffer( Name_buff, szProcName, \
cbProcName );
escape_input_parameter(&stmt->dbc->mysql, ProcQualifier);
escape_input_parameter(&stmt->dbc->mysql, ProcName);
--- 1.51/driver/utility.c 2005-07-20 07:22:43 -07:00
+++ 1.52/driver/utility.c 2005-08-05 22:02:57 -07:00
@@ -357,6 +357,9 @@
@type : myodbc internal
@purpose : get type, transfer length and precision for a unireg column
note that timestamp is changed to YYYY-MM-DD HH:MM:SS type
+
+ SQLUINTEGER
+
*/
int unireg_to_sql_datatype(STMT FAR *stmt, MYSQL_FIELD *field, char *buff,
--- 1.9/MYODBCConfig/main.cpp 2005-01-31 21:14:13 -08:00
+++ 1.10/MYODBCConfig/main.cpp 2005-08-05 22:02:56 -07:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (C) 2000-2005 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
--- 1.3/README.osx 2005-07-30 08:17:59 -07:00
+++ 1.4/README.osx 2005-08-05 22:02:56 -07:00
@@ -28,6 +28,7 @@
10.3 (Panther) with a complete online update.
NOTE 3.51.10: Now using a G5 single 1.8 Ghz.
+NOTE 3.51.12: Now using 10.4 (Tiger).
Well; actually I had to reinstall everything after ending up
with multiple ODBC systems on my OSX. Apple has not done a good
@@ -67,7 +68,8 @@
OSX distribution. Its gcc with some GUI stuff.
NOTE 3.51.10: Now using xcode v1.5.
-
+NOTE 3.51.12: Now using xcode v2.0.
+
ODBC
----
@@ -95,6 +97,8 @@
NOTE 3.51.11: Built with MySQL 4.1.9.
+NOTE 3.51.12: Built with MySQL 4.1.13.
+
MyODBC
------
@@ -140,6 +144,7 @@
For this version I have decided to build qt as;
$ ./configure -static -thread
+NOTE 3.51.12: Now using qt 3.3.3 commercial.
Qt will take a long time to build. This tired old iBook
spent most of a day spinnings its bits.
@@ -155,7 +160,10 @@
$ make -f Makefile.cvs macosx
This will replace a few files for libtool so do not check
- any changes into bk when done.
+ any changes into bk when done. The macosx arg is needed because
+ OSX does not have libtoolize (by default).
+
+NOTE 3.51.12: Makefile.cvs has been renamed to Makefile.bk.
I did not want to build or install the server parts - I just
wanted the client stuff. I also wanted to link myodbc against
@@ -200,6 +208,8 @@
$ ./configure --prefix=/usr --with-iODBC=/usr --with-iODBC-includes=/usr/include \
--with-ldflags=-lltdl --without-samples --disable-gui --disable-test $ make
$ make install
+
+NOTE 3.51.12: Makefile.cvs has been renamed to Makefile.bk.
This will result in the following files;
--- 1.1/myodbc-3.51.vpw 2005-08-05 13:43:37 -07:00
+++ 1.2/myodbc-3.51.vpw 2005-08-05 22:02:57 -07:00
@@ -1,11 +1,6 @@
<!DOCTYPE Workspace SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpw.dtd">
<Workspace Version="10.0" VendorName="SlickEdit">
<Projects>
- <Project File="/SandBox/MySQL/myodbc-3.51/MYODBCConfig/myodbc-3.51-MYODBCConfig.vpj"/>
- <Project File="/SandBox/MySQL/myodbc-3.51/myodbcinst/myodbc-3.51-myodbcinst.vpj"/>
- <Project File="/SandBox/MySQL/myodbc-3.51/setup/myodbc-3.51-setup.vpj"/>
- <Project File="/SandBox/MySQL/myodbc-3.51/test/myodbc-3.51-test.vpj"/>
- <Project File="/SandBox/MySQL/myodbc-3.51/util/myodbc-3.51-util.vpj"/>
- <Project File="/SandBox/MySQL/myodbc-3.51/myodbc-3.51.vpj"/>
+ <Project File="root.vpj"/>
</Projects>
</Workspace>
--- 1.1/MYODBCConfig/main.cpp.alternative 2004-11-09 11:03:21 -08:00
+++ 1.2/MYODBCConfig/main.cpp.alternative 2005-08-05 22:02:56 -07:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (C) 2000-2005 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
--- New file ---
+++ root.vpj 05/08/05 21:59:53
<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
<Project
Version="10.0"
VendorName="SlickEdit"
WorkingDir=".">
<Config
Name="Release"
OutputFile=""
CompilerConfigName="Latest Version">
<Menu>
<Target
Name="Compile"
MenuCaption="&Compile"
CaptureOutputWith="ProcessBuffer"
SaveOption="SaveCurrent"
RunFromDir="%rw">
<Exec/>
</Target>
<Target
Name="Build"
MenuCaption="&Build"
CaptureOutputWith="ProcessBuffer"
SaveOption="SaveWorkspaceFiles"
RunFromDir="%rw">
<Exec/>
</Target>
<Target
Name="Rebuild"
MenuCaption="&Rebuild"
CaptureOutputWith="ProcessBuffer"
SaveOption="SaveWorkspaceFiles"
RunFromDir="%rw">
<Exec/>
</Target>
<Target
Name="Debug"
MenuCaption="&Debug"
SaveOption="SaveNone"
RunFromDir="%rw">
<Exec/>
</Target>
<Target
Name="Execute"
MenuCaption="E&xecute"
SaveOption="SaveNone"
RunFromDir="%rw">
<Exec CmdLine='"root.exe"'/>
</Target>
</Menu>
</Config>
<Files>
<Folder
Name="Source Files"
Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl"/>
<Folder
Name="Header Files"
Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if"/>
<Folder
Name="Resource Files"
Filters="*.ico;*.cur;*.dlg"/>
<Folder
Name="Bitmaps"
Filters="*.bmp"/>
<Folder
Name="Other Files"
Filters="">
<F N="ChangeLog"/>
<F N="configure.in"/>
<F N="COPYING"/>
<F N="EXCEPTIONS"/>
<F N="Makefile.am"/>
<F N="Makefile.bk"/>
<F N="qmake.pro"/>
<F N="README"/>
<F N="README.dist"/>
<F N="README.osx"/>
<F N="README.unix"/>
<F N="README.win"/>
</Folder>
</Files>
</Project>
--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=mysql-odbc@progressive-comp.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic