Quellcode durchsuchen

* Added to build, extra fix, added mysql56dyn

git-svn-id: trunk@26190 -
michael vor 11 Jahren
Ursprung
Commit
b480fc761a
4 geänderte Dateien mit 21 neuen und 1 gelöschten Zeilen
  1. 1 0
      .gitattributes
  2. 7 0
      packages/mysql/fpmake.pp
  3. 1 1
      packages/mysql/src/mysql.inc
  4. 12 0
      packages/mysql/src/mysql56dyn.pp

+ 1 - 0
.gitattributes

@@ -5533,6 +5533,7 @@ packages/mysql/src/mysql51dyn.pp svneol=native#text/plain
 packages/mysql/src/mysql51emb.pp svneol=native#text/plain
 packages/mysql/src/mysql55.pp svneol=native#text/plain
 packages/mysql/src/mysql55dyn.pp svneol=native#text/plain
+packages/mysql/src/mysql56dyn.pp svneol=native#text/plain
 packages/ncurses/Makefile svneol=native#text/plain
 packages/ncurses/Makefile.fpc svneol=native#text/plain
 packages/ncurses/Makefile.fpc.fpcmake svneol=native#text/plain

+ 7 - 0
packages/mysql/fpmake.pp

@@ -133,6 +133,13 @@ begin
         end;
     T.ResourceStrings := True;
 
+    T:=P.Targets.AddUnit('mysql56dyn.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('mysql.inc');
+        end;
+    T.ResourceStrings := True;
+
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testdb3.pp');
     P.Targets.AddExampleProgram('testdb4.pp');

+ 1 - 1
packages/mysql/src/mysql.inc

@@ -537,7 +537,7 @@ uses
     function my_net_init(net:PNET; vio:PVio):my_bool;cdecl;external mysqllib name 'my_net_init';
     procedure my_net_local_init(net:PNET);cdecl;external mysqllib name 'my_net_local_init';
     procedure net_end(net:PNET);cdecl;external mysqllib name 'net_end';
-    procedure net_clear(net:PNET;{$IFDEF mysql51}check_buffer:my_bool{$ENDIF});cdecl;external mysqllib name 'net_clear';
+    procedure net_clear(net:PNET{$IFDEF mysql51};check_buffer:my_bool{$ENDIF});cdecl;external mysqllib name 'net_clear';
     function net_realloc(net:PNET; length:culong):my_bool;cdecl;external mysqllib name 'net_realloc';
     function net_flush(net:PNET):my_bool;cdecl;external mysqllib name 'net_flush';
     function my_net_write(net:PNET; packet:Pchar; len:culong):my_bool;cdecl;external mysqllib name 'my_net_write';

+ 12 - 0
packages/mysql/src/mysql56dyn.pp

@@ -0,0 +1,12 @@
+{
+  Contains the MySQL calls for MySQL 5.6
+}
+
+unit mysql56dyn;
+
+{$DEFINE LinkDynamically}
+{$DEFINE MYSQL56}
+
+{$i mysql.inc}
+
+end.