From: Pekka Nousiainen
Date: June 15 2011 12:51pm
Subject: bzr commit into mysql-5.1-telco-7.0-wl4124-new1 branch
 (pekka.nousiainen:4400) WL#4124
List-Archive: http://lists.mysql.com/commits/139235
Message-Id: <20110615125106.665515586E@sama.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0820164385=="

--===============0820164385==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/space/pekka/ms/ms-wl4124-70/ based on revid:pekka.nousiainen@stripped

 4400 Pekka Nousiainen	2011-06-15
      wl#4124 x08_fix.diff
      build fixes

    modified:
      libmysqld/Makefile.am
      sql/ha_ndb_index_stat.cc
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-02-12 14:48:30 +0000
+++ b/libmysqld/Makefile.am	2011-06-15 12:51:00 +0000
@@ -49,6 +49,7 @@ noinst_HEADERS =	embedded_priv.h emb_qca
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	     ha_ndbcluster.cc ha_ndbcluster_cond.cc \
 	ha_ndbcluster_connection.cc ha_ndbinfo.cc \
+	ha_ndb_index_stat.cc \
 	ha_ndbcluster_binlog.cc ha_partition.cc \
 	handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
@@ -121,6 +122,9 @@ ha_ndbcluster_binlog.o: ha_ndbcluster_bi
 ha_ndbcluster_connection.o: ha_ndbcluster_connection.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
+ha_ndb_index_stat.o: ha_ndb_index_stat.cc
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+
 ha_ndbinfo.o: ha_ndbinfo.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 

=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-06-15 10:37:56 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-06-15 12:51:00 +0000
@@ -1811,7 +1811,7 @@ ha_ndbcluster::ndb_index_stat_query(uint
   DBUG_PRINT("index_stat", ("index: %s", index->getName()));
 
   THD *thd= current_thd;
-  Ndb *ndb= get_ndb(thd);
+  Ndb *ndb= get_thd_ndb(thd)->ndb;
   int err= 0;
 
   /* Create an IndexBound struct for the keys */


--===============0820164385==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/pekka.nousiainen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pekka.nousiainen@stripped\
#   6zm3fulu4lrresvf
# target_branch: file:///export/space/pekka/ms/ms-wl4124-70/
# testament_sha1: e49e004579085cd312d7b4701b8e5dd6875cbeb1
# timestamp: 2011-06-15 15:51:06 +0300
# base_revision_id: pekka.nousiainen@stripped\
#   c4qjavyvanmbqn0q
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfKoL2UAAhFfgEAwXHP//3un
yES////wUAStexA63ZppQACUU000pobEaaTGak00aaNNGhoDANQDVIfqTyNMoGmTIAAaaYg0BkAA
lCmEU8KabU02iPUAyGgZPSaaAABzAJgJkYARiYmEwmCGmJpgJJI0AAmEyNJkGhlPVB6E0ADTalkY
xfJl9bdLcHgw1adJHefACqTw2EE3PpjcqvihgaypeOuN1Fg4iKKqqnprQ+HSztVhZVgqPF5RS9NR
vaqdZ86v3NmhnOCoFqWeq3us76KHl+CUGKIb8l07hXSa9Nxv4WKwYFabCmwC/fL4BPw5OwP7l1h8
oDio0UuQvt3oR09JQ08SSZ4GlUVb8iBkvOdOoGQZscB0RREczC8rx/YXRExmIYRIM0Ka3sYgelMU
iZiYpg+/uGAN2BArjcwbeC80gyuY5tTATYWBjYETLUWtIQiTGAQvnoaEkAdedJTxxw21wuNoWup2
wFpR6W4iVlRHugV/RgmKiguHLQpMmMhm026ICwnfM5zJFt8RtIZHm2AtYWPDM41yYx06XlsLEpFP
BWyT7brSJi44E4FsG8tmLBgoIj21zH3tq0bZMFzXDFuxUR5O+vM/4DgEQ+UzMy8CAFByqK5r8Q3m
NEIcazW81n1t02g7ZgJXq1tHS11hKYzBXqBGQSUE42YJOleQyACOwygKUA0eysqxnDArqOkEYlia
ewFRQF6YaoJoSEvK5pBzjaSKIljQ1FJtlLi+V87i1p9ILGeSskYyBBBorBHoRes0/TnSyTgsoUVc
GUUMPgW25m8rkE2c9hRRVM9df1E3Xrr273VxzyHJxy8bMLW1SW75BopE5GXQWfWMOwm9hKRQikJ5
DnyO2GEZIKU9/lahPhPO2FHzEsPId+SyMIvcL6UpB4mPcPlpizfBjadpKzRnhEDSSMWlg1iaO4lL
NoLe27QwDBLVUVsQB5TvQx89adzMhOw3E0glXf8273Xmzlu2DFdQPBqiBEkvu9BINg4tuhFUTHlb
sWNWW+60EY/nwP7dAzxmQeTS41ILBEg4uF7EUdN0fVgmUyg71wIJNNjWTi4vkEvReiYOebzyo6v5
byQDcyLB4pUPnIWWIxnXGsGHkPKNR9xSFf2J1odj6NNi46EwG89YjdzZDpcMeLaLUJFw0altVE2M
jIRIbijBEw5VozdCCxYQz4IIC1otEMLISq+m+6CxHcjwoIC7cHCDQ7isSkqUBWjISjxP4nOg8IHo
pgDvi5ORUhMGlOzPvAmcBGTRKVC9uA89QLX0GfcoQlIKzHOTxiiUjfXKWyRzYAxAhNxJXiz6+7hT
Qi2SOSV3mbpg9kL4Xc/AtFMwMscpHx9fCxJSI3PLLkLzRQvFyv+PBCxtxCPTVhg7D04Op1TDulHG
o6E8POaSugPu9QsXkE1B38QpED4EswKOmCj8ZFX8Z4aOoEdEkmA5Q7GlsdUasUEpgJdyIDn5TBzi
1NWn4FJMKKkUAF1TC6+boDUH3JOqrgzDLtV8J9utg0qKl+J5joWDSgC+x3HmgmoEvB+uYTqIDJEh
tae4Jh5dpZlmbIhQ+jkQI9TsbORYFUq0Al0P/F3JFOFCQ8qgvZQ=


--===============0820164385==--