diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-03-25 18:11:58 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-03-25 18:11:58 +0000 |
| commit | 0c03dd2f20a5819577ccaf01771ad11e74c4fd49 (patch) | |
| tree | abe6113e0caccb234651bcb956f1a93aeb3f8df3 /packages/fcl-db | |
| parent | 8d73a0ace1a82898107a74e1247a5f655a581a77 (diff) | |
| download | fpc-0c03dd2f20a5819577ccaf01771ad11e74c4fd49.tar.gz | |
* Better fix for mantis 17661, see r17077
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@17179 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-db')
| -rw-r--r-- | packages/fcl-db/src/sqldb/mysql/mysql50conn.pas | 1 | ||||
| -rw-r--r-- | packages/fcl-db/src/sqldb/mysql/mysql51conn.pas | 2 | ||||
| -rw-r--r-- | packages/fcl-db/src/sqldb/mysql/mysqlconn.inc | 10 |
3 files changed, 6 insertions, 7 deletions
diff --git a/packages/fcl-db/src/sqldb/mysql/mysql50conn.pas b/packages/fcl-db/src/sqldb/mysql/mysql50conn.pas index a3695ad929..80e3994d91 100644 --- a/packages/fcl-db/src/sqldb/mysql/mysql50conn.pas +++ b/packages/fcl-db/src/sqldb/mysql/mysql50conn.pas @@ -4,6 +4,7 @@ unit mysql50conn; +{$DEFINE MYSQL50_up} {$DEFINE MYSQL50} {$i mysqlconn.inc} diff --git a/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas b/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas index 9088bc80f4..41bbc113b0 100644 --- a/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas +++ b/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas @@ -4,6 +4,8 @@ unit mysql51conn; +{$DEFINE MYSQL50_UP} +{$DEFINE MYSQL51_UP} {$DEFINE MYSQL51} {$i mysqlconn.inc} diff --git a/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc b/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc index a9c0dc1d73..8f6f7a61e2 100644 --- a/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc +++ b/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc @@ -188,12 +188,8 @@ const 'MYSQL_OPT_USE_REMOTE_CONNECTION','MYSQL_OPT_USE_EMBEDDED_CONNECTION', 'MYSQL_OPT_GUESS_CONNECTION','MYSQL_SET_CLIENT_IP', 'MYSQL_SECURE_AUTH' -{$IFDEF MYSQL50} +{$IFDEF MYSQL50_UP} ,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT' -{$ELSE} - {$IFDEF MYSQL51} - ,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT' - {$ENDIF} {$ENDIF} ); @@ -559,7 +555,7 @@ begin NewType := ftInteger; NewSize := 0; end; -{$if defined(mysql51) or defined(mysql50)} +{$ifdef mysql50_up} FIELD_TYPE_NEWDECIMAL, {$endif} FIELD_TYPE_DECIMAL: if ADecimals < 5 then @@ -867,7 +863,7 @@ begin VL := 0; Move(VL, Dest^, SizeOf(LargeInt)); end; -{$if defined(mysql51) or defined(mysql50)} +{$ifdef mysql50_up} FIELD_TYPE_NEWDECIMAL, {$endif} FIELD_TYPE_DECIMAL, FIELD_TYPE_FLOAT, FIELD_TYPE_DOUBLE: |