diff --git a/.gitattributes b/.gitattributes index e41f73968b..b0513a5559 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2149,7 +2149,6 @@ packages/fcl-db/src/sqldb/mysql/fpmake.inc svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/fpmake.pp svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql40conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql41conn.pas svneol=native#text/plain -packages/fcl-db/src/sqldb/mysql/mysql4conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql50conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql51conn.pas svneol=native#text/plain packages/fcl-db/src/sqldb/mysql/mysql55conn.pas svneol=native#text/plain diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp index b82e627dc1..940f787c4b 100644 --- a/packages/fcl-db/fpmake.pp +++ b/packages/fcl-db/fpmake.pp @@ -583,6 +583,7 @@ begin begin AddUnit('db'); end; + T:=P.Targets.AddUnit('mysql40conn.pas', SqldbConnectionOSes); T.ResourceStrings:=true; with T.Dependencies do @@ -603,16 +604,7 @@ begin AddUnit('db'); AddUnit('dbconst'); end; - T:=P.Targets.AddUnit('mysql4conn.pas', SqldbConnectionOSes); - T.ResourceStrings:=true; - with T.Dependencies do - begin - AddInclude('mysqlconn.inc'); - AddUnit('bufdataset'); - AddUnit('sqldb'); - AddUnit('db'); - AddUnit('dbconst'); - end; + T:=P.Targets.AddUnit('mysql50conn.pas', SqldbConnectionOSes); T.ResourceStrings:=true; with T.Dependencies do diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile.fpc b/packages/fcl-db/src/sqldb/mysql/Makefile.fpc index 0f93e3c8f3..76f76506e6 100644 --- a/packages/fcl-db/src/sqldb/mysql/Makefile.fpc +++ b/packages/fcl-db/src/sqldb/mysql/Makefile.fpc @@ -1,13 +1,13 @@ # -# Makefile.fpc for SQL IBConnection +# Makefile.fpc for SQL MySQLConnection # [package] main=fcl-db [target] -units=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn -rsts=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn +units=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn +rsts=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn [require] packages=fcl-xml mysql diff --git a/packages/fcl-db/src/sqldb/mysql/fpmake.inc b/packages/fcl-db/src/sqldb/mysql/fpmake.inc index e76540e1dc..50fcd03c85 100644 --- a/packages/fcl-db/src/sqldb/mysql/fpmake.inc +++ b/packages/fcl-db/src/sqldb/mysql/fpmake.inc @@ -7,5 +7,3 @@ Targets.ResetDefaults; Targets.DefaultDir:='db/sqldb/mysql'; { Drivers only for the following OSes } Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux,haiku]; -T:=Targets.AddUnit('mysql4conn'); -T.ResourceStrings:=True; diff --git a/packages/fcl-db/src/sqldb/mysql/mysql4conn.pas b/packages/fcl-db/src/sqldb/mysql/mysql4conn.pas deleted file mode 100644 index 1b94a66246..0000000000 --- a/packages/fcl-db/src/sqldb/mysql/mysql4conn.pas +++ /dev/null @@ -1,13 +0,0 @@ -{ - Contains the TMysqlConnection for MySQL 4.0 - - temporary backwards compatibility for Lazarus -} - -unit mysql4conn; - -{$DEFINE MYSQL4} - -{$i mysqlconn.inc} - -end. diff --git a/packages/fcl-db/src/sqldb/testsqldb.pp b/packages/fcl-db/src/sqldb/testsqldb.pp index a37512bc14..ed39971c73 100644 --- a/packages/fcl-db/src/sqldb/testsqldb.pp +++ b/packages/fcl-db/src/sqldb/testsqldb.pp @@ -22,7 +22,7 @@ program testsqldb; uses Classes, pqconnection, - mysql4conn, + mysql51conn, IBConnection, sqlite3conn, sqldb; @@ -35,7 +35,7 @@ var connection : tSQLConnection; begin dbtype := paramstr(1); - if dbtype = 'mysql' then connection := tMySQLConnection.Create(nil); + if dbtype = 'mysql' then connection := tMySQL51Connection.Create(nil); if dbtype = 'postgresql' then connection := tpqConnection.Create(nil); if dbtype = 'interbase' then connection := tIBConnection.Create(nil); if dbtype = 'sqlite3' then connection := tSQLite3Connection.Create(nil);