[Pkg-mysql-commits] r866 - in branches/sid-5.0/debian: . patches

[Sean Finney]

Author: seanius
Date: 2007-05-12 09:27:38 +0000 (Sat, 12 May 2007)
New Revision: 866

Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/patches/86_PATH_MAX.dpatch
Log:
nm, i just forgot how to use dpatch

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-05-12 09:21:44 UTC (rev 865)
+++ branches/sid-5.0/debian/changelog	2007-05-12 09:27:38 UTC (rev 866)
@@ -14,8 +14,7 @@
     - Arabic. Closes: #421751
     - Czech. Closes: #421766
     - Portuguese. Closes: #422428
-  * update the PATH_MAX patch as all but one of the patches have been applied
-    upstream.
+  * massaged the local PATH_MAX patch.
   * upstream no longer includes the mysql_create_system_tables command,
     so removed our local patches for it.
   * the following issues may have been fixed in a previous version of

Modified: branches/sid-5.0/debian/patches/86_PATH_MAX.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/86_PATH_MAX.dpatch	2007-05-12 09:21:44 UTC (rev 865)
+++ branches/sid-5.0/debian/patches/86_PATH_MAX.dpatch	2007-05-12 09:27:38 UTC (rev 866)
@@ -6,6 +6,98 @@
 ## DP: http://bugs.mysql.com/16574 and Debian bug #378949, #348182.
 
 @DPATCH@
+
+--- old/ndb/src/common/logger/FileLogHandler.cpp
++++ new/ndb/src/common/logger/FileLogHandler.cpp
+@@ -18,6 +18,10 @@
+ #include <FileLogHandler.hpp>
+ #include <File.hpp>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ //
+ // PUBLIC
+ //
+--- old/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
++++ new/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+@@ -64,6 +64,10 @@
+ #define WRITEBUFFERSIZE 262144
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ const char *actionName[] = {
+   "open",
+   "close",
+--- old/ndb/src/kernel/blocks/ndbfs/Filename.cpp
++++ new/ndb/src/kernel/blocks/ndbfs/Filename.cpp
+@@ -25,6 +25,10 @@
+ 
+ #include <signaldata/FsOpenReq.hpp>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ static const char* fileExtension[] = {
+   ".Data",
+   ".FragLog",
+--- old/ndb/src/kernel/blocks/ndbfs/Filename.hpp
++++ new/ndb/src/kernel/blocks/ndbfs/Filename.hpp
+@@ -17,6 +17,10 @@
+ #ifndef Filename_H
+ #define Filename_H
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ //===========================================================================
+ //
+ // .DESCRIPTION
+--- old/ndb/src/kernel/vm/Configuration.cpp
++++ new/ndb/src/kernel/vm/Configuration.cpp
+@@ -39,6 +39,10 @@
+ #include <LogLevel.hpp>
+ #include <NdbSleep.h>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ extern "C" {
+   void ndbSetOwnVersion();
+ }
+--- old/ndb/src/cw/cpcd/CPCD.cpp
++++ new/ndb/src/cw/cpcd/CPCD.cpp
+@@ -24,6 +24,10 @@
+ 
+ #include "common.hpp"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ extern const ParserRow<CPCDAPISession> commands[];
+ 
+ 
+--- old/ndb/src/cw/cpcd/Process.cpp
++++ new/ndb/src/cw/cpcd/Process.cpp
+@@ -27,6 +27,10 @@
+ #include <sys/resource.h>
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ void
+ CPCD::Process::print(FILE * f){
+   fprintf(f, "define process\n");
 --- old/ndb/tools/restore/Restore.hpp 	2007-04-06 00:41:47.000000000 +0200
 +++ new/ndb/tools/restore/Restore.hpp   2007-04-06 00:42:22.000000000 +0200
 @@ -25,6 +25,10 @@
@@ -19,3 +111,29 @@
  const int FileNameLenC = 256;
  const int TableNameLenC = 256;
  const int AttrNameLenC = 256;
+--- old/ndb/include/util/File.hpp
++++ new/ndb/include/util/File.hpp
+@@ -19,6 +19,10 @@
+
+ #include <ndb_global.h>
+
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ /**
+  * This class provides a file abstraction . It has operations
+  * to create, read, write and delete a file.
+--- old/ndb/src/common/portlib/NdbConfig.c
++++ new/ndb/src/common/portlib/NdbConfig.c
+@@ -20,6 +20,10 @@
+ #include <NdbMem.h>
+ #include <basestring_vsnprintf.h>
+
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ static const char *datadir_path= 0;
+
+ const char *