* Attempt at MySQL 5.1 connection

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15980 3ad0048d-3df7-0310-abae-a5850022a9f2

4 files changed, 245 insertions, 265 deletions

diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile b/packages/fcl-db/src/sqldb/mysql/Makefile
index fdf328824b..f515f5809f 100644
--- a/packages/fcl-db/src/sqldb/mysql/Makefile
+++ b/packages/fcl-db/src/sqldb/mysql/Makefile
@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/02/11]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/11/05]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) solaris qnx haiku
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
@@ -59,11 +59,9 @@ endif
 endif
 ifdef COMSPEC
 ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
-ifndef RUNBATCH
 RUNBATCH=$(COMSPEC) /C
 endif
 endif
-endif
 ifdef inUnix
 PATHSEP=/
 else
@@ -267,370 +265,352 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=fcl-db
 PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR))))))
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn
+override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -693,9 +673,6 @@ endif
 ifeq ($(FULL_TARGET),i386-symbian)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-S2
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_OPTIONS+=-S2
 endif
@@ -759,9 +736,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-S2
-endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_OPTIONS+=-S2
 endif
@@ -813,9 +787,6 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_OPTIONS+=-S2
 endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-S2
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1189,10 +1160,6 @@ ifeq ($(OS_TARGET),symbian)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=symbian
 endif
-ifeq ($(OS_TARGET),NativeNT)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=nativent
-endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1744,12 +1711,6 @@ REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),i386-nativent)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_MYSQL=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
@@ -1884,12 +1845,6 @@ REQUIRE_PACKAGES_ICONVENC=1
 REQUIRE_PACKAGES_FCL-XML=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_MYSQL=1
-endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_UNIVINT=1
@@ -2001,13 +1956,6 @@ REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_ICONVENC=1
-REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_MYSQL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -2017,9 +1965,9 @@ else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
 ifdef CHECKDEPEND
-$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE)
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -2484,9 +2432,6 @@ endif
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
 endif
-ifdef CLEAN_PROGRAMS
-override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
-endif
 ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile.fpc b/packages/fcl-db/src/sqldb/mysql/Makefile.fpc
index b2a4aae620..cbd2b6adc3 100644
--- a/packages/fcl-db/src/sqldb/mysql/Makefile.fpc
+++ b/packages/fcl-db/src/sqldb/mysql/Makefile.fpc
@@ -6,8 +6,8 @@
 main=fcl-db
 
 [target]
-units=mysql40conn mysql41conn mysql50conn mysql4conn
-rsts=mysql40conn mysql41conn mysql50conn mysql4conn
+units=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
+rsts=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn
 [require]
 packages=fcl-xml mysql
 
diff --git a/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas b/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas
new file mode 100644
index 0000000000..9088bc80f4
--- /dev/null
+++ b/packages/fcl-db/src/sqldb/mysql/mysql51conn.pas
@@ -0,0 +1,11 @@
+{
+  Contains the TMysqlConnection for MySQL 5.1
+}
+
+unit mysql51conn;
+
+{$DEFINE MYSQL51}
+
+{$i mysqlconn.inc}
+
+end.
diff --git a/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc b/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
index 97085d2891..0ed85ff45c 100644
--- a/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
+++ b/packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
@@ -5,34 +5,42 @@ interface
 
 uses
   Classes, SysUtils,bufdataset,sqldb,db,dynlibs,
-{$IfDef mysql50}
-  mysql50dyn;
-{$ELSE}
-  {$IfDef mysql41}
-    mysql41dyn;
+{$IFDEF Mysql51}
+  mysql51dyn;
+{$ELSE}  
+  {$IfDef mysql50}
+    mysql50dyn;
   {$ELSE}
-    {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
-      mysql40dyn;
+    {$IfDef mysql41}
+      mysql41dyn;
     {$ELSE}
-      mysql40dyn;
+      {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+        mysql40dyn;
+      {$ELSE}
+        mysql40dyn;
+      {$EndIf}
     {$EndIf}
   {$EndIf}
-{$EndIf}
+{$endif}
 
 Const
-{$IfDef mysql50}
-  MySQLVersion = '5.0';
-{$ELSE}
-  {$IfDef mysql41}
-    MySQLVersion = '4.1';
+{$IFDEF Mysql51}
+    MySQLVersion = '5.1';
+{$else}    
+  {$IfDef mysql50}
+    MySQLVersion = '5.0';
   {$ELSE}
-    {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
-      MySQLVersion = '4.0';
+    {$IfDef mysql41}
+      MySQLVersion = '4.1';
     {$ELSE}
-      MySQLVersion = '4.0';
+      {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+        MySQLVersion = '4.0';
+      {$ELSE}
+        MySQLVersion = '4.0';
+      {$EndIf}
     {$EndIf}
   {$EndIf}
-{$EndIf}
+{$endif}
 
 Type
   TTransactionName = Class(TSQLHandle)
@@ -132,32 +140,38 @@ Type
 
   EMySQLError = Class(Exception);
 
-{$IfDef mysql50}
-  TMySQL50Connection = Class(TConnectionName);
-  TMySQL50ConnectionDef = Class(TMySQLConnectionDef);
-  TMySQL50Transaction = Class(TTransactionName);
-  TMySQL50Cursor = Class(TCursorName);
-{$ELSE}
-  {$IfDef mysql41}
-    TMySQL41Connection = Class(TConnectionName);
-    TMySQL41ConnectionDef = Class(TMySQLConnectionDef);
-    TMySQL41Transaction = Class(TTransactionName);
-    TMySQL41Cursor = Class(TCursorName);
+  {$IfDef mysql51}
+    TMySQL51Connection = Class(TConnectionName);
+    TMySQL51ConnectionDef = Class(TMySQLConnectionDef);
+    TMySQL51Transaction = Class(TTransactionName);
+    TMySQL51Cursor = Class(TCursorName);
+  {$ELSE}
+  {$IfDef mysql50}
+    TMySQL50Connection = Class(TConnectionName);
+    TMySQL50ConnectionDef = Class(TMySQLConnectionDef);
+    TMySQL50Transaction = Class(TTransactionName);
+    TMySQL50Cursor = Class(TCursorName);
   {$ELSE}
-    {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
-      TMySQLConnection = Class(TConnectionName);
-      TMySQL40ConnectionDef = Class(TMySQLConnectionDef);
-      TMySQLTransaction = Class(TTransactionName);
-      TMySQLCursor = Class(TCursorName);
+    {$IfDef mysql41}
+      TMySQL41Connection = Class(TConnectionName);
+      TMySQL41ConnectionDef = Class(TMySQLConnectionDef);
+      TMySQL41Transaction = Class(TTransactionName);
+      TMySQL41Cursor = Class(TCursorName);
     {$ELSE}
-      TMySQL40Connection = Class(TConnectionName);
-      TMySQL40ConnectionDef = Class(TMySQLConnectionDef);
-      TMySQL40Transaction = Class(TTransactionName);
-      TMySQL40Cursor = Class(TCursorName);
+      {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+        TMySQLConnection = Class(TConnectionName);
+        TMySQL40ConnectionDef = Class(TMySQLConnectionDef);
+        TMySQLTransaction = Class(TTransactionName);
+        TMySQLCursor = Class(TCursorName);
+      {$ELSE}
+        TMySQL40Connection = Class(TConnectionName);
+        TMySQL40ConnectionDef = Class(TMySQLConnectionDef);
+        TMySQL40Transaction = Class(TTransactionName);
+        TMySQL40Cursor = Class(TCursorName);
+      {$EndIf}
     {$EndIf}
   {$EndIf}
-{$EndIf}
-
+{$ENDIF}
 
 implementation
 
@@ -176,6 +190,10 @@ const
      'MYSQL_SECURE_AUTH'
 {$IFDEF MYSQL50}
      ,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT'
+{$ELSE}     
+  {$IFDEF MYSQL51}
+     ,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT'
+  {$ENDIF}     
 {$ENDIF}
      );
 
@@ -189,9 +207,7 @@ Resourcestring
   SErrFetchingdata = 'Error fetching row data: %s';
   SErrGettingResult = 'Error getting result set: %s';
   SErrNoQueryResult = 'No result from query.';
-  SErrNotversion50 = 'TMySQL50Connection can not work with the installed MySQL client version (%s).';
-  SErrNotversion41 = 'TMySQL41Connection can not work with the installed MySQL client version (%s).';
-  SErrNotversion40 = 'TMySQL40Connection can not work with the installed MySQL client version (%s).';
+  SErrVersionMismatch = '%s can not work with the installed MySQL client version: Expected (%s), got (%s).';
   SErrSettingParameter = 'Error setting parameter "%s"';
 
 Procedure MySQlError(R : PMySQL;Msg: String;Comp : TComponent);
@@ -389,22 +405,15 @@ begin
 end;
 
 procedure TConnectionName.DoInternalConnect;
-var ClientVerStr: string;
+var
+  FullVersion, 
+  ClientVerStr: string;
 begin
   InitialiseMysql;
-  ClientVerStr := copy(strpas(mysql_get_client_info()),1,3);
-{$IFDEF mysql50}
-  if (ClientVerStr<>'5.0') and (ClientVerStr<>'5.1') then
-    Raise EInOutError.CreateFmt(SErrNotversion50,[strpas(mysql_get_client_info())]);
-{$ELSE}
-  {$IFDEF mysql41}
-  if ClientVerStr<>'4.1' then
-    Raise EInOutError.CreateFmt(SErrNotversion41,[strpas(mysql_get_client_info())]);
-  {$ELSE}
-  if ClientVerStr<>'4.0' then
-    Raise EInOutError.CreateFmt(SErrNotversion40,[strpas(mysql_get_client_info())]);
-  {$ENDIF}
-{$ENDIF}
+  Fullversion:=strpas(mysql_get_client_info());
+  ClientVerStr := copy(FullVersion,1,3);
+  If (ClientVerStr<>MySQLVersion) then
+    Raise EInOutError.CreateFmt(SErrVersionMisMatch,[ClassName,MySQLVersion,FullVersion]);
   inherited DoInternalConnect;
   ConnectToServer;
   SelectDatabase;
@@ -425,16 +434,20 @@ end;
 
 function TConnectionName.AllocateCursorHandle: TSQLCursor;
 begin
-  {$IfDef mysql50}
-    Result:=TMySQL50Cursor.Create;
+  {$IfDef mysql51}
+    Result:=TMySQL51Cursor.Create;
   {$ELSE}
-    {$IfDef mysql41}
-      Result:=TMySQL41Cursor.Create;
+    {$IfDef mysql50}
+      Result:=TMySQL50Cursor.Create;
     {$ELSE}
-      {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
-        Result:=TMySQLCursor.Create;
+      {$IfDef mysql41}
+        Result:=TMySQL41Cursor.Create;
       {$ELSE}
-        Result:=TMySQL40Cursor.Create;
+        {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+          Result:=TMySQLCursor.Create;
+        {$ELSE}
+          Result:=TMySQL40Cursor.Create;
+        {$EndIf}
       {$EndIf}
     {$EndIf}
   {$EndIf}
@@ -1047,19 +1060,23 @@ end;
 
 class function TMySQLConnectionDef.ConnectionClass: TSQLConnectionClass;
 begin
-  {$IfDef mysql50}
-    Result:=TMySQL50Connection;
+  {$IfDef mysql51}
+    Result:=TMySQL51Connection;
   {$ELSE}
-    {$IfDef mysql41}
-      Result:=TMySQL41Connection;
+    {$IfDef mysql50}
+      Result:=TMySQL50Connection;
     {$ELSE}
-      {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
-        Result:=TMySQLConnection;
+      {$IfDef mysql41}
+        Result:=TMySQL41Connection;
       {$ELSE}
-        Result:=TMySQL40Connection;
+        {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+          Result:=TMySQLConnection;
+        {$ELSE}
+          Result:=TMySQL40Connection;
+        {$EndIf}
       {$EndIf}
     {$EndIf}
-  {$EndIf}
+  {$endif}
 end;
 
 class function TMySQLConnectionDef.Description: String;
@@ -1067,30 +1084,37 @@ begin
   Result:='Connect to a MySQL '+MySQLVersion+'database directly via the client library';
 end;
 
-{$IfDef mysql50}
+{$IfDef mysql51}
   initialization
-    RegisterConnection(TMySQL50ConnectionDef);
+    RegisterConnection(TMySQL51ConnectionDef);
   finalization
-    UnRegisterConnection(TMySQL50ConnectionDef);
+    UnRegisterConnection(TMySQL51ConnectionDef);
 {$ELSE}
-  {$IfDef mysql41}
+  {$IfDef mysql50}
     initialization
-      RegisterConnection(TMySQL41ConnectionDef);
+      RegisterConnection(TMySQL50ConnectionDef);
     finalization
-      UnRegisterConnection(TMySQL41ConnectionDef);
+      UnRegisterConnection(TMySQL50ConnectionDef);
   {$ELSE}
-    {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+    {$IfDef mysql41}
       initialization
-        RegisterConnection(TMySQL40ConnectionDef);
+        RegisterConnection(TMySQL41ConnectionDef);
       finalization
-        UnRegisterConnection(TMySQL40ConnectionDef);
+        UnRegisterConnection(TMySQL41ConnectionDef);
     {$ELSE}
-      initialization
-        RegisterConnection(TMySQL40ConnectionDef);
-      finalization
-        UnRegisterConnection(TMySQL40ConnectionDef);
+      {$IFDEF mysql4} // temporary backwards compatibility for Lazarus
+        initialization
+          RegisterConnection(TMySQL40ConnectionDef);
+        finalization
+          UnRegisterConnection(TMySQL40ConnectionDef);
+      {$ELSE}
+        initialization
+          RegisterConnection(TMySQL40ConnectionDef);
+        finalization
+          UnRegisterConnection(TMySQL40ConnectionDef);
+      {$EndIf}
     {$EndIf}
   {$EndIf}
-{$EndIf}
+{$ENDIF}
 
 end.