* Basic moving and updating of mysql. makefile.fpc's included, regened makefiles not.

     fpmake also in separate commit (will follow shortly)

git-svn-id: trunk@9922 -

.gitattributes

@@ -1164,40 +1164,9 @@ packages/base/libc/wordsizeh.inc svneol=native#text/plain
 packages/base/libc/xlocaleh.inc svneol=native#text/plain
 packages/base/libc/xopen_limh.inc svneol=native#text/plain
 packages/base/mysql/Makefile svneol=native#text/plain
-packages/base/mysql/Makefile.fpc svneol=native#text/plain
 packages/base/mysql/README -text
 packages/base/mysql/fpmake.inc svneol=native#text/plain
 packages/base/mysql/fpmake.pp svneol=native#text/plain
-packages/base/mysql/mkdb -text
-packages/base/mysql/my4_sys.pp svneol=native#text/plain
-packages/base/mysql/mysql.inc svneol=native#text/plain
-packages/base/mysql/mysql3.pp svneol=native#text/plain
-packages/base/mysql/mysql3_com.pp svneol=native#text/plain
-packages/base/mysql/mysql3_comdyn.pp svneol=native#text/plain
-packages/base/mysql/mysql3_comtypes.inc svneol=native#text/plain
-packages/base/mysql/mysql3_version.pp svneol=native#text/plain
-packages/base/mysql/mysql3dyn.pp svneol=native#text/plain
-packages/base/mysql/mysql3impl.inc svneol=native#text/plain
-packages/base/mysql/mysql3types.inc svneol=native#text/plain
-packages/base/mysql/mysql4.pp svneol=native#text/plain
-packages/base/mysql/mysql40.pp svneol=native#text/plain
-packages/base/mysql/mysql40dyn.pp svneol=native#text/plain
-packages/base/mysql/mysql41.pp svneol=native#text/plain
-packages/base/mysql/mysql41dyn.pp svneol=native#text/plain
-packages/base/mysql/mysql4_com.pp svneol=native#text/plain
-packages/base/mysql/mysql4_comdyn.pp svneol=native#text/plain
-packages/base/mysql/mysql4_comtypes.inc svneol=native#text/plain
-packages/base/mysql/mysql4_version.pp svneol=native#text/plain
-packages/base/mysql/mysql4dyn.pp svneol=native#text/plain
-packages/base/mysql/mysql4impl.inc svneol=native#text/plain
-packages/base/mysql/mysql4types.inc svneol=native#text/plain
-packages/base/mysql/mysql50.pp svneol=native#text/plain
-packages/base/mysql/mysql50dyn.pp svneol=native#text/plain
-packages/base/mysql/mysqls.c -text
-packages/base/mysql/mysqls.pp svneol=native#text/plain
-packages/base/mysql/rmdb -text
-packages/base/mysql/testdb3.pp svneol=native#text/plain
-packages/base/mysql/testdb4.pp svneol=native#text/plain
 packages/base/mysql/ver322/mysql.pp svneol=native#text/plain
 packages/base/mysql/ver322/mysql_com.pp svneol=native#text/plain
 packages/base/mysql/ver322/mysql_version.pp svneol=native#text/plain
@@ -4305,6 +4274,37 @@ packages/hash/src/md5.pp svneol=native#text/plain
 packages/hash/src/ntlm.pas svneol=native#text/plain
 packages/hash/src/unixcrypt.pas svneol=native#text/plain
 packages/hash/src/uuid.pas svneol=native#text/plain
+packages/mysql/Makefile.fpc svneol=native#text/plain
+packages/mysql/scripts/mkdb svneol=native#text/plain
+packages/mysql/scripts/rmdb svneol=native#text/plain
+packages/mysql/src/my4_sys.pp svneol=native#text/plain
+packages/mysql/src/mysql.inc svneol=native#text/plain
+packages/mysql/src/mysql3.pp svneol=native#text/plain
+packages/mysql/src/mysql3_com.pp svneol=native#text/plain
+packages/mysql/src/mysql3_comdyn.pp svneol=native#text/plain
+packages/mysql/src/mysql3_comtypes.inc svneol=native#text/plain
+packages/mysql/src/mysql3_version.pp svneol=native#text/plain
+packages/mysql/src/mysql3dyn.pp svneol=native#text/plain
+packages/mysql/src/mysql3impl.inc svneol=native#text/plain
+packages/mysql/src/mysql3types.inc svneol=native#text/plain
+packages/mysql/src/mysql4.pp svneol=native#text/plain
+packages/mysql/src/mysql40.pp svneol=native#text/plain
+packages/mysql/src/mysql40dyn.pp svneol=native#text/plain
+packages/mysql/src/mysql41.pp svneol=native#text/plain
+packages/mysql/src/mysql41dyn.pp svneol=native#text/plain
+packages/mysql/src/mysql4_com.pp svneol=native#text/plain
+packages/mysql/src/mysql4_comdyn.pp svneol=native#text/plain
+packages/mysql/src/mysql4_comtypes.inc svneol=native#text/plain
+packages/mysql/src/mysql4_version.pp svneol=native#text/plain
+packages/mysql/src/mysql4dyn.pp svneol=native#text/plain
+packages/mysql/src/mysql4impl.inc svneol=native#text/plain
+packages/mysql/src/mysql4types.inc svneol=native#text/plain
+packages/mysql/src/mysql50.pp svneol=native#text/plain
+packages/mysql/src/mysql50dyn.pp svneol=native#text/plain
+packages/mysql/tests/mysqls.c svneol=native#text/plain
+packages/mysql/tests/mysqls.pp svneol=native#text/plain
+packages/mysql/tests/testdb3.pp svneol=native#text/plain
+packages/mysql/tests/testdb4.pp svneol=native#text/plain
 packages/pasjpeg/Makefile svneol=native#text/plain
 packages/pasjpeg/Makefile.fpc svneol=native#text/plain
 packages/pasjpeg/examples/cderror.pas svneol=native#text/plain

packages/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [target]
-dirs=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process
+dirs=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process mysql
 dirs_freebsd=fcl-web fcl-async
 dirs_darwin=fcl-web fcl-async
 dirs_solaris=fcl-web fcl-async
@@ -99,11 +99,11 @@ fcl-web_smart: fcl-db_smart fcl-xml_smart fcl-process_smart
 fcl-web_release: fcl-db_release fcl-xml_release fcl-process_release
 fcl-web_shared: fcl-db_shared fcl-xml_shared fcl-process_shared
 
-fcl-db_all: fcl-base_all
-fcl-db_debug: fcl-base_debug
-fcl-db_smart: fcl-base_smart
-fcl-db_release: fcl-base_release
-fcl-db_shared: fcl-base_shared
+fcl-db_all: fcl-base_all mysql_all
+fcl-db_debug: fcl-base_debug mysql_debug
+fcl-db_smart: fcl-base_smart mysql_smart
+fcl-db_release: fcl-base_release mysql_release
+fcl-db_shared: fcl-base_shared mysql_shared
 
 fcl_all: fcl-base_all fcl-xml_all fcl-fpcunit_all fcl-db_all fcl-web_all fcl-registry_all fcl-passrc_all fcl-image_all fcl-net_all fcl-json_all
 fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_debug fcl-registry_debug fcl-passrc_debug fcl-image_debug fcl-net_debug fcl-json_debug
@@ -117,4 +117,3 @@ paszlib_smart: hash_smart
 paszlib_release: hash_release
 paszlib_shared: hash_shared
 
-

packages/base/Makefile.fpc

@@ -5,17 +5,17 @@
 [target]
 dirs=regexpr
 dirs_i386_linux=libc
-dirs_linux=gdbint mysql ibase postgres oracle odbc pthreads sqlite imagemagick dbus httpd
-dirs_win32=gdbint mysql ibase odbc sqlite postgres oracle imagemagick httpd 
-dirs_win64=mysql ibase odbc sqlite postgres oracle 
+dirs_linux=gdbint  ibase postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+dirs_win32=gdbint  ibase odbc sqlite postgres oracle imagemagick httpd 
+dirs_win64= ibase odbc sqlite postgres oracle 
 dirs_wince=ibase sqlite postgres
 dirs_go32v2=gdbint
-dirs_netbsd=gdbint mysql ibase postgres oracle odbc imagemagick httpd
-dirs_openbsd=gdbint mysql ibase postgres oracle odbc imagemagick httpd
-dirs_beos=gdbint mysql ibase postgres odbc sqlite pthreads imagemagick
-dirs_freebsd=gdbint mysql ibase postgres oracle odbc sqlite pthreads imagemagick httpd
-dirs_darwin=mysql ibase postgres oracle odbc sqlite pthreads imagemagick httpd
-dirs_solaris=mysql ibase postgres oracle odbc sqlite pthreads imagemagick httpd
+dirs_netbsd=gdbint  ibase postgres oracle odbc imagemagick httpd
+dirs_openbsd=gdbint  ibase postgres oracle odbc imagemagick httpd
+dirs_beos=gdbint  ibase postgres odbc sqlite pthreads imagemagick
+dirs_freebsd=gdbint  ibase postgres oracle odbc sqlite pthreads imagemagick httpd
+dirs_darwin= ibase postgres oracle odbc sqlite pthreads imagemagick httpd
+dirs_solaris= ibase postgres oracle odbc sqlite pthreads imagemagick httpd
 
 
 [rules]

packages/base/mysql/Makefile.fpc → packages/mysql/Makefile.fpc

@@ -17,11 +17,15 @@ libc=y
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../..
 
 [shared]
 build=n
 
+[compiler]
+includedir=src 
+sourcedir=src tests
+
 [rules]
 .NOTPARALLEL: