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

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-10-12 03:48:23 +0000 (Fri, 12 Oct 2007)
New Revision: 957

Added:
   branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch
Modified:
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/control
   branches/sid-5.1/debian/libmysqlclient-dev.files
   branches/sid-5.1/debian/patches/00list
Log:
  implementation. Should be fixed upstream in 5.1.23.
* Added accessor methods needed for NDB/Connectors to operate properly.
  Should be fixed upstream in 5.1.23.
* Added libndbclient-dev package to go with libndbclient3. 

Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-10-12 00:30:14 UTC (rev 956)
+++ branches/sid-5.1/debian/changelog	2007-10-12 03:48:23 UTC (rev 957)
@@ -13,9 +13,12 @@
   * Added myself to the uploaders so that I don't get complaints about package
     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.  
+    implementation. Should be fixed upstream in 5.1.23.
+  * Added accessor methods needed for NDB/Connectors to operate properly.
+    Should be fixed upstream in 5.1.23.
+  * Added libndbclient-dev package to go with libndbclient3. 
 
- -- Monty Taylor <mtaylor at mysql.com>  Thu, 11 Oct 2007 17:29:12 -0700
+ -- Monty Taylor <mtaylor at mysql.com>  Thu, 11 Oct 2007 18:37:09 -0700
 
 mysql-dfsg-5.1 (5.1.22rc-1) experimental; urgency=low
 

Modified: branches/sid-5.1/debian/control
===================================================================
--- branches/sid-5.1/debian/control	2007-10-12 00:30:14 UTC (rev 956)
+++ branches/sid-5.1/debian/control	2007-10-12 03:48:23 UTC (rev 957)
@@ -52,6 +52,19 @@
  .
  This package includes development libraries and header files.
 
+Package: libndbclient-dev
+Architecture: any
+Section: libdevel
+Depends: libndbclient3 (>= ${source:Version}), ${shlibs:Depends}
+Description: MySQL NDB API development files
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes development libraries and header files for the NDB API
+ used to develop applications against NDB cluster.
+
 Package: mysql-common
 Section: misc
 Architecture: all

Modified: branches/sid-5.1/debian/libmysqlclient-dev.files
===================================================================
--- branches/sid-5.1/debian/libmysqlclient-dev.files	2007-10-12 00:30:14 UTC (rev 956)
+++ branches/sid-5.1/debian/libmysqlclient-dev.files	2007-10-12 03:48:23 UTC (rev 957)
@@ -1,7 +1,7 @@
 usr/bin/mysql_config
 usr/include/*
-usr/lib/*.a
-usr/lib/*.la
+usr/lib/libmysqlclient.a
+usr/lib/libmysqlclient.la
 usr/lib/mysql/*.a
 usr/lib/mysql/*.la
 usr/share/man/man1/mysql_config.1

Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list	2007-10-12 00:30:14 UTC (rev 956)
+++ branches/sid-5.1/debian/patches/00list	2007-10-12 03:48:23 UTC (rev 957)
@@ -7,4 +7,5 @@
 70_upstream_debian__configure.dpatch
 71_upstream_debian__Makefile.in.dpatch
 85_NdbPool_create_instance.dpatch
+86_Ndb_connectors_utility_methods.dpatch
 99_TEMP_minmax.dpatch

Added: branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch	                        (rev 0)
+++ branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch	2007-10-12 03:48:23 UTC (rev 957)
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 86_Ndb_connectors_utility_methods.dpatch by  <mtaylor at mysql.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add accessor methods necessary for NDB/Connectors
+
+ at DPATCH@
+diff -urNad sid-5.1~/storage/ndb/include/ndbapi/NdbScanFilter.hpp sid-5.1/storage/ndb/include/ndbapi/NdbScanFilter.hpp
+--- sid-5.1~/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2007-09-24 03:29:58.000000000 -0700
++++ sid-5.1/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2007-10-11 17:16:21.096566653 -0700
+@@ -166,6 +166,7 @@
+   /** @} *********************************************************************/
+ #endif
+ 
++  NdbOperation * getNdbOperation();
+ private:
+ #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
+   friend class NdbScanFilterImpl;
+diff -urNad sid-5.1~/storage/ndb/include/ndbapi/NdbTransaction.hpp sid-5.1/storage/ndb/include/ndbapi/NdbTransaction.hpp
+--- sid-5.1~/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-09-24 03:29:41.000000000 -0700
++++ sid-5.1/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-10-11 17:16:21.096566653 -0700
+@@ -170,6 +170,13 @@
+ #endif
+   };
+ 
++  /**
++   * Convenience method to fetch this transactions Ndb* object 
++   */
++  Ndb * getNdb() { 
++    return theNdb; 
++  }
++
+ #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
+   /**
+    * Get an NdbOperation for a table.
+diff -urNad sid-5.1~/storage/ndb/src/ndbapi/NdbScanFilter.cpp sid-5.1/storage/ndb/src/ndbapi/NdbScanFilter.cpp
+--- sid-5.1~/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-09-24 03:30:25.000000000 -0700
++++ sid-5.1/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-10-11 17:16:21.096566653 -0700
+@@ -282,6 +282,10 @@
+   }
+ }
+ 
++NdbOperation * 
++NdbScanFilter::getNdbOperation(){
++  return m_impl.m_operation; 
++}
+ 
+ #define action(x, y, z)
+ 


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