[Pkg-mysql-commits] r956 - in branches/sid-5.1/debian: . patches

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-10-12 00:30:14 +0000 (Fri, 12 Oct 2007)
New Revision: 956

Added:
   branches/sid-5.1/debian/patches/85_NdbPool_create_instance.dpatch
Modified:
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/patches/00list
Log:
  signing.
* Added a patch to fix the NdbPool.hpp header file, which doesn't match the
  implementation. Should be fixed upstream in 5.1.23.  

Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-10-12 00:28:40 UTC (rev 955)
+++ branches/sid-5.1/debian/changelog	2007-10-12 00:30:14 UTC (rev 956)
@@ -11,9 +11,11 @@
   [ Monty Taylor ]
   * Removed 85_ndb__staticlib.dpatch since we have a libndbclient package now.
   * Added myself to the uploaders so that I don't get complaints about package
-    signing. 
+    signing.
+  * Added a patch to fix the NdbPool.hpp header file, which doesn't match the
+    implementation. Should be fixed upstream in 5.1.23.  
 
- -- Monty Taylor <mtaylor at mysql.com>  Thu, 11 Oct 2007 17:27:46 -0700
+ -- Monty Taylor <mtaylor at mysql.com>  Thu, 11 Oct 2007 17:29:12 -0700
 
 mysql-dfsg-5.1 (5.1.22rc-1) experimental; urgency=low
 

Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list	2007-10-12 00:28:40 UTC (rev 955)
+++ branches/sid-5.1/debian/patches/00list	2007-10-12 00:30:14 UTC (rev 956)
@@ -6,4 +6,5 @@
 44_scripts__mysql_config__libs.dpatch
 70_upstream_debian__configure.dpatch
 71_upstream_debian__Makefile.in.dpatch
+85_NdbPool_create_instance.dpatch
 99_TEMP_minmax.dpatch

Added: branches/sid-5.1/debian/patches/85_NdbPool_create_instance.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/85_NdbPool_create_instance.dpatch	                        (rev 0)
+++ branches/sid-5.1/debian/patches/85_NdbPool_create_instance.dpatch	2007-10-12 00:30:14 UTC (rev 956)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85_NdbPool_create_instance.dpatch by  <monty at inaugust.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad sid-5.1~/storage/ndb/include/ndbapi/NdbPool.hpp sid-5.1/storage/ndb/include/ndbapi/NdbPool.hpp
+--- sid-5.1~/storage/ndb/include/ndbapi/NdbPool.hpp	2007-09-24 03:30:24.000000000 -0700
++++ sid-5.1/storage/ndb/include/ndbapi/NdbPool.hpp	2007-10-11 16:58:38.243998137 -0700
+@@ -17,7 +17,8 @@
+ class NdbPool;
+ 
+ bool
+-create_instance(Uint32 max_ndb_objects,
++create_instance(Ndb_cluster_connection* cc,
++                Uint32 max_ndb_objects,
+                 Uint32 no_conn_obj,
+                 Uint32 init_no_ndb_objects);
+ 


Property changes on: branches/sid-5.1/debian/patches/85_NdbPool_create_instance.dpatch
___________________________________________________________________
Name: svn:executable
   + *