mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-23 00:09:31 +02:00
+ added mysql4conn for backwards-compatibility
git-svn-id: trunk@1783 -
This commit is contained in:
joost
parent
ee6bdd4424
commit
0f99b4ee64
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -718,6 +718,7 @@ fcl/db/sqldb/mysql/fpmake.inc svneol=native#text/plain
|
||||
fcl/db/sqldb/mysql/fpmake.pp svneol=native#text/plain
|
||||
fcl/db/sqldb/mysql/mysql40conn.pas svneol=native#text/plain
|
||||
fcl/db/sqldb/mysql/mysql41conn.pas svneol=native#text/plain
|
||||
fcl/db/sqldb/mysql/mysql4conn.pas svneol=native#text/plain
|
||||
fcl/db/sqldb/mysql/mysqlconn.inc svneol=native#text/plain
|
||||
fcl/db/sqldb/odbc/Makefile svneol=native#text/plain
|
||||
fcl/db/sqldb/odbc/Makefile.fpc svneol=native#text/plain
|
||||
|
||||
@ -233,115 +233,115 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
|
||||
override PACKAGE_NAME=fcl
|
||||
PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-win32)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-os2)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-freebsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-solaris)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-qnx)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netware)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-openbsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wdosx)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-emx)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-watcom)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netwlibc)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wince)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-netbsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-amiga)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-atari)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-openbsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-palmos)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-darwin)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-solaris)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-win64)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-wince)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn
|
||||
override TARGET_UNITS+=mysql40conn mysql41conn mysql4conn
|
||||
endif
|
||||
override INSTALL_FPCPACKAGE=y
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
main=fcl
|
||||
|
||||
[target]
|
||||
units=mysql40conn mysql41conn
|
||||
units=mysql40conn mysql41conn mysql4conn
|
||||
|
||||
[require]
|
||||
packages=mysql
|
||||
|
||||
13
fcl/db/sqldb/mysql/mysql4conn.pas
Normal file
13
fcl/db/sqldb/mysql/mysql4conn.pas
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
Contains the TMysqlConnection for MySQL 4.0
|
||||
|
||||
temporary backwards compatibility for Lazarus
|
||||
}
|
||||
|
||||
unit mysql4conn;
|
||||
|
||||
{$DEFINE MYSQL4}
|
||||
|
||||
{$i mysqlconn.inc}
|
||||
|
||||
end.
|
||||
@ -6,16 +6,23 @@ interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils,sqldb,db,
|
||||
{$IfNDef mysql41}
|
||||
mysql40dyn;
|
||||
{$DEFINE TConnectionName:=TMySQL40Connection}
|
||||
{$DEFINE TTransactionName:=TMySQL40Transaction}
|
||||
{$DEFINE TCursorName:=TMySQL40Cursor}
|
||||
{$Else}
|
||||
{$IfDef mysql41}
|
||||
mysql41dyn;
|
||||
{$DEFINE TConnectionName:=TMySQL41Connection}
|
||||
{$DEFINE TTransactionName:=TMySQL41Transaction}
|
||||
{$DEFINE TCursorName:=TMySQL41Cursor}
|
||||
{$ELSE}
|
||||
{$IFDEF mysql4} // temporary backwards compatibility for Lazarus
|
||||
mysql40dyn;
|
||||
{$DEFINE TConnectionName:=TMySQLConnection}
|
||||
{$DEFINE TTransactionName:=TMySQLTransaction}
|
||||
{$DEFINE TCursorName:=TMySQLCursor}
|
||||
{$ELSE}
|
||||
mysql40dyn;
|
||||
{$DEFINE TConnectionName:=TMySQL40Connection}
|
||||
{$DEFINE TTransactionName:=TMySQL40Transaction}
|
||||
{$DEFINE TCursorName:=TMySQL40Cursor}
|
||||
{$EndIf}
|
||||
{$EndIf}
|
||||
|
||||
Type
|
||||
|
||||
Loading…
Reference in New Issue
Block a user