At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
------------------------------------------------------------
revno: 307
revision-id:mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Fri 2008-01-11 12:05:26 -0800
message:
* Merged in perl changes.
modified:
debian/changelog changelog-20071219024048-xwcgy5oe2wb2dk64-2
perl/Makefile.am makefile.am-20070228070325-lv4v4ey3018yr147-1
perl/async.pl async.pl-20070323111328-n9taxfigqgv14j06-1
perl/blob.pl blob.pl-20070320103802-1fj4gjsm3kscynqp-1
perl/mgmapi.i mgmapi.i-20070415084702-pjs702i1rleb6otl-1
perl/mgmapi/Makefile.PL makefile.pl-20070415084659-wsk1egwac627tea7-2
perl/ndbapi.i ndb.i-20070225155255-5ief7aicto319mbu-1
perl/ndbapi/Makefile.PL makefile.pl-20070415084728-1u1ct1xe6fw97w3l-2
perl/swig/perl_extend_ndbtransaction_async.i
perl_extend_ndbtrans-20070323110355-zppwqruk69m5t3hz-2
perl/test.pl
svn-v2:1@5fca6d9a-db22-0410-b55c-899b0a28da89-trunk-perl5%2ftest.pl
------------------------------------------------------------
revno: 192.1.25.1.107.1.87
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Fri 2008-01-11 11:35:42 -0800
message:
Reverted premature version bump.
modified:
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
------------------------------------------------------------
revno: 192.1.25.1.107.1.86
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Fri 2008-01-11 11:34:54 -0800
message:
Added proper file depends on perl/{ndb,mgm}_wrap.cpp
modified:
perl/Makefile.am makefile.am-20070228070325-lv4v4ey3018yr147-1
------------------------------------------------------------
revno: 192.1.25.1.107.1.85
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2008-01-10 22:37:46 -0800
message:
Shrunk Perl namespace from mysql::cluster::ndbapi back to ndbapi.
modified:
perl/Makefile.am makefile.am-20070228070325-lv4v4ey3018yr147-1
perl/async.pl async.pl-20070323111328-n9taxfigqgv14j06-1
perl/blob.pl blob.pl-20070320103802-1fj4gjsm3kscynqp-1
perl/mgmapi.i mgmapi.i-20070415084702-pjs702i1rleb6otl-1
perl/mgmapi/Makefile.PL makefile.pl-20070415084659-wsk1egwac627tea7-2
perl/ndbapi.i ndb.i-20070225155255-5ief7aicto319mbu-1
perl/ndbapi/Makefile.PL makefile.pl-20070415084728-1u1ct1xe6fw97w3l-2
perl/swig/perl_extend_ndbtransaction_async.i
perl_extend_ndbtrans-20070323110355-zppwqruk69m5t3hz-2
perl/test.pl
svn-v2:1@5fca6d9a-db22-0410-b55c-899b0a28da89-trunk-perl5%2ftest.pl
------------------------------------------------------------
revno: 192.1.25.1.107.1.84
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Sun 2008-01-06 12:43:12 -0800
message:
Test commit.
modified:
README readme-20070228020914-u2pk759xg7thauwf-7
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-01-11 19:15:24 +0000
+++ b/debian/changelog 2008-01-11 20:05:26 +0000
@@ -1,3 +1,9 @@
+ndb-connectors (0.5.6.3.7.3-1) gutsy; urgency=low
+
+ * Merged in perl changes.
+
+ -- Monty Taylor <monty@stripped> Fri, 11 Jan 2008 12:04:31 -0800
+
ndb-connectors (0.5.6.3.7.2-2) gutsy; urgency=low
* Bumped revision to re-build against 6.3.7-4
=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am 2007-12-13 00:07:58 +0000
+++ b/perl/Makefile.am 2008-01-11 19:34:54 +0000
@@ -1,6 +1,7 @@
PERL_MAKEFILE=Makefile.perl
-SWIG_OUTPUTS=lib/mysql/cluster/mgmapi.pm lib/mysql/cluster/ndbapi.pm
+#SWIG_OUTPUTS=lib/mysql/cluster/mgmapi.pm lib/mysql/cluster/ndbapi.pm
+SWIG_OUTPUTS=lib/mgmapi.pm lib/ndbapi.pm
PERL_CRUFT=pm_to_blib ndbapi.bs ndbapi_wrap.o mgmapi.bz mgmapi_wrap.o
PERL_SWIG_SRC=swig/perl_callback_typemap.i swig/perl_extend_ndbtransaction_async.i
fakedir=$(prefix)
@@ -12,24 +13,25 @@
CLEANFILES=$(PERL_CRUFT) ${SWIG_OUTPUTS}
MAINTAINERCLEANFILES=
-SWIG_OPTS=-perl5 $(DEFS) -outdir lib/mysql/cluster -I${top_srcdir} -I$(SWIG_DIR)
-I$(srcdir)/swig $(MYSQL_INCLUDES)
+SWIG_OPTS=-perl5 $(DEFS) -outdir lib -I${top_srcdir} -I$(SWIG_DIR) -I$(srcdir)/swig
$(MYSQL_INCLUDES)
-ndbapi/ndbapi_wrap.cpp lib/mysql/cluster/ndbapi.pm: ndbapi.i $(SWIG_NDB_SOURCES)
- mkdir -p lib/mysql/cluster
+#ndbapi/ndbapi_wrap.cpp lib/mysql/cluster/ndbapi.pm: ndbapi.i $(SWIG_NDB_SOURCES)
+ndbapi/ndbapi_wrap.cpp lib/ndbapi.pm: ndbapi.i $(SWIG_NDB_SOURCES)
+ mkdir -p lib #/mysql/cluster
$(SWIG) $(SWIG_OPTS) -o ndbapi/ndbapi_wrap.cpp ndbapi.i
-mgmapi/mgmapi_wrap.cpp lib/mysql/cluster/mgmapi.pm: mgmapi.i $(SWIG_MGM_SOURCES)
- mkdir -p lib/mysql/cluster
+mgmapi/mgmapi_wrap.cpp lib/mgmapi.pm: mgmapi.i $(SWIG_MGM_SOURCES)
+ mkdir -p lib #/mysql/cluster
$(SWIG) $(SWIG_OPTS) -o mgmapi/mgmapi_wrap.cpp mgmapi.i
-$(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
lib/mysql/cluster/ndbapi.pm lib/mysql/cluster/mgmapi.pm $(srcdir)/Makefile.am
+$(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
lib/ndbapi.pm lib/mgmapi.pm $(srcdir)/Makefile.am
echo "$(DEB_MAKE_PL_OPT) should be INSTALLDIRS=vendor"
- CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
$(DEB_MAKE_PL_OPT)
+ CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
$(DEB_MAKE_PL_OPT) PREFIX="${prefix}"
--perl install-perl: $(PERL_MAKEFILE)
+-perl install-perl: $(PERL_MAKEFILE) ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
@target=`echo $@ | sed -e 's/-perl//'`; \
echo $(MAKE) -f $(PERL_MAKEFILE) $$target; \
- DESTDIR=$(DESTDIR) $(MAKE) $(AM_MAKEFLAGS) -f $(PERL_MAKEFILE) $$target
PREFIX="${PREFIX}"
+ DESTDIR=$(DESTDIR) $(MAKE) $(AM_MAKEFLAGS) -f $(PERL_MAKEFILE) $$target
PREFIX="${prefix}"
test-perl: $(PERL_MAKEFILE)
$(RUN)$(MAKE) -f $(PERL_MAKEFILE) test
@@ -42,7 +44,7 @@
fi
build-perl: -perl
-build-perl-stamp: ndbapi.i mgmapi.i
+build-perl-stamp: ndbapi.i mgmapi.i ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
$(MAKE) build-perl && touch build-perl-stamp
check-local: build-perl-stamp test-perl
=== modified file 'perl/async.pl'
--- a/perl/async.pl 2007-05-07 08:01:13 +0000
+++ b/perl/async.pl 2008-01-11 06:37:46 +0000
@@ -19,7 +19,7 @@
use lib 'blib/arch';
use lib 'blib';
use lib 'blib/lib';
-use mysql::cluster::ndbapi;
+use ndbapi;
use DBI;
use POSIX qw( ceil floor );
use Time::HiRes qw( gettimeofday tv_interval sleep );
@@ -53,7 +53,7 @@
print "connecting to cluster\n";
-$connection = mysql::cluster::ndbapi::NdbFactory::createNdbClusterConnection();
+$connection = ndbapi::NdbFactory::createNdbClusterConnection();
if ($connection->connect(5,3,1)) {
=== modified file 'perl/blob.pl'
--- a/perl/blob.pl 2007-04-15 08:50:19 +0000
+++ b/perl/blob.pl 2008-01-11 06:37:46 +0000
@@ -20,7 +20,7 @@
use lib 'blib';
use lib 'blib/lib';
-use mysql::cluster::ndbapi;
+use ndbapi;
use DBI;
use POSIX qw( ceil floor );
use Time::HiRes qw( gettimeofday tv_interval );
@@ -55,7 +55,7 @@
print "connecting to cluster\n";
-$connection = new mysql::cluster::ndbapi::Ndb_cluster_connection();
+$connection = new ndbapi::Ndb_cluster_connection();
if ($connection->connect(5,3,1)) {
@@ -70,7 +70,7 @@
exit -1;
} else { print "cluster ready\n"; }
-$myNdb = new mysql::cluster::ndbapi::Ndb($connection,"test_db_1");
+$myNdb = new ndbapi::Ndb($connection,"test_db_1");
if ($myNdb->init(4) == -1) {
=== modified file 'perl/mgmapi.i'
--- a/perl/mgmapi.i 2007-11-26 03:09:58 +0000
+++ b/perl/mgmapi.i 2008-01-11 06:37:46 +0000
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-%module "mysql::cluster::mgmapi"
+%module "mgmapi"
%include "mgmapi/mgmglobals.i"
%{
=== modified file 'perl/mgmapi/Makefile.PL'
--- a/perl/mgmapi/Makefile.PL 2007-11-06 22:59:00 +0000
+++ b/perl/mgmapi/Makefile.PL 2008-01-11 06:37:46 +0000
@@ -7,7 +7,7 @@
WriteMakefile(
- 'NAME' => "mysql::cluster::mgmapi",
+ 'NAME' => "mgmapi",
'AUTHOR' => 'Monty Taylor <mtaylor@stripped>',
'ABSTRACT' => "NDB/Perl",
=== modified file 'perl/ndbapi.i'
--- a/perl/ndbapi.i 2007-11-06 22:59:00 +0000
+++ b/perl/ndbapi.i 2008-01-11 06:37:46 +0000
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-%module "mysql::cluster::ndbapi"
+%module "ndbapi"
%include "ndbapi/ndbglobals.i"
%{
@@ -35,9 +35,9 @@
%{
sub createNdb {
my $self=$_[0];
- my $ndb=mysql::cluster::ndbapic::NdbClusterConnection_createNdb(@_);
+ my $ndb=ndbapic::NdbClusterConnection_createNdb(@_);
my $t=tied(%{$ndb});
- $mysql::cluster::ndbapi::ndb_connectors_owned{$t}=$self;
+ $ndbapi::ndb_connectors_owned{$t}=$self;
return $ndb;
}
%}
=== modified file 'perl/ndbapi/Makefile.PL'
--- a/perl/ndbapi/Makefile.PL 2007-11-06 22:59:00 +0000
+++ b/perl/ndbapi/Makefile.PL 2008-01-11 06:37:46 +0000
@@ -7,7 +7,7 @@
WriteMakefile(
- 'NAME' => "mysql::cluster::ndbapi",
+ 'NAME' => "ndbapi",
'AUTHOR' => 'Monty Taylor <mtaylor@stripped>',
'ABSTRACT' => "NDB/Perl",
=== modified file 'perl/swig/perl_extend_ndbtransaction_async.i'
--- a/perl/swig/perl_extend_ndbtransaction_async.i 2007-11-05 18:12:57 +0000
+++ b/perl/swig/perl_extend_ndbtransaction_async.i 2008-01-11 06:37:46 +0000
@@ -11,7 +11,7 @@
my $abort=shift;
-mysql::cluster::ndbapic::NdbTransaction_executeAsynchPrepare($self, $exec,
+ndbapic::NdbTransaction_executeAsynchPrepare($self, $exec,
sub { $sub->(); $self; }, $abort);
}
%}
=== modified file 'perl/test.pl'
--- a/perl/test.pl 2007-07-26 00:26:33 +0000
+++ b/perl/test.pl 2008-01-11 06:37:46 +0000
@@ -20,7 +20,7 @@
use lib 'blib';
use lib 'blib/lib';
-use mysql::cluster::ndbapi;
+use ndbapi;
use DBI;
use POSIX qw( ceil floor );
use Time::HiRes qw( gettimeofday tv_interval );
@@ -52,7 +52,7 @@
print "connecting to cluster\n";
-$connection = mysql::cluster::ndbapi::NdbFactory::createNdbClusterConnection();
+$connection = ndbapi::NdbFactory::createNdbClusterConnection();
if ($connection->connect(1,1,1)) {
@@ -104,7 +104,7 @@
}
- my $ret = $myTransaction->execute($mysql::cluster::ndbapi::Commit);
+ my $ret = $myTransaction->execute($ndbapi::Commit);
if ($ret == -1) {
print $myTransaction->getNdbError()->getMessage(), "\n";
@@ -131,7 +131,7 @@
print $myTransaction->getNdbError()->getMessage() unless $myScanOperation;
-if
($myScanOperation->readTuples($mysql::cluster::ndbapi::NdbOperation::LM_CommittedRead))
{
+if ($myScanOperation->readTuples($ndbapi::NdbOperation::LM_CommittedRead)) {
print $myScanOperation->getNdbError()->getMessage();
}
@@ -139,7 +139,7 @@
my $myRecAttr=$myScanOperation->getValue("ATTR1");
-$myTransaction->execute($mysql::cluster::ndbapi::NoCommit);
+$myTransaction->execute($ndbapi::NoCommit);
while ($myScanOperation->nextResult() == 0) {
@@ -171,7 +171,7 @@
my $myRecAttr = $myOper->getValue("ATTR2");
- $myTransaction->execute( $mysql::cluster::ndbapi::Commit );
+ $myTransaction->execute( $ndbapi::Commit );
$foo=$myRecAttr->getUint32();
| Thread |
|---|
| • Rev 307: * Merged in perl changes. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3 | Monty Taylor | 11 Jan |
