bzr push into mysql-5.1-telco-7.0 branch (frazer:4185 to 4187)

[Frazer Clement]

 4187 Frazer Clement	2011-02-09
      Add _count suffix to all NdbApi counter names to simplify 
      filtering in where clause.

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      sql/ha_ndbcluster.cc
 4186 Frazer Clement	2011-02-09
      Bug#60045 ndb_select_all not printing NULL for NULL values
      
      Fix problem with [NULL] not being printed.

    modified:
      storage/ndb/src/ndbapi/NdbRecAttr.cpp
 4185 Jonas Oreland	2011-02-09
      ndb - bug#52298 - remove extra unneccesary (but harmless) wakeups for scan

    modified:
      storage/ndb/src/ndbapi/NdbTransactionScan.cpp
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2011-02-04 17:52:38 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2011-02-09 11:25:52 +0000
@@ -2,12 +2,12 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t
 drop database if exists mysqltest;
 SHOW GLOBAL STATUS LIKE 'ndb\_%';
 Variable_name	Value
-Ndb_api_bytes_received	#
-Ndb_api_bytes_received_session	#
-Ndb_api_bytes_received_slave	#
-Ndb_api_bytes_sent	#
-Ndb_api_bytes_sent_session	#
-Ndb_api_bytes_sent_slave	#
+Ndb_api_bytes_received_count	#
+Ndb_api_bytes_received_count_session	#
+Ndb_api_bytes_received_count_slave	#
+Ndb_api_bytes_sent_count	#
+Ndb_api_bytes_sent_count_session	#
+Ndb_api_bytes_sent_count_slave	#
 Ndb_api_event_bytes_count	#
 Ndb_api_event_bytes_count_injector	#
 Ndb_api_event_data_count	#
@@ -56,9 +56,9 @@ Ndb_api_wait_exec_complete_count_slave	#
 Ndb_api_wait_meta_request_count	#
 Ndb_api_wait_meta_request_count_session	#
 Ndb_api_wait_meta_request_count_slave	#
-Ndb_api_wait_nanos	#
-Ndb_api_wait_nanos_session	#
-Ndb_api_wait_nanos_slave	#
+Ndb_api_wait_nanos_count	#
+Ndb_api_wait_nanos_count_session	#
+Ndb_api_wait_nanos_count_slave	#
 Ndb_api_wait_scan_result_count	#
 Ndb_api_wait_scan_result_count_session	#
 Ndb_api_wait_scan_result_count_slave	#

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-02-08 09:55:53 +0000
+++ b/sql/ha_ndbcluster.cc	2011-02-09 11:25:52 +0000
@@ -482,13 +482,13 @@ static int update_status_variables(Thd_n
   {"api_wait_meta_request_count" NAME_SUFFIX,                           \
    (char*) ARRAY_LOCATION[ Ndb::WaitMetaRequestCount ],                 \
    SHOW_LONGLONG},                                                      \
-  {"api_wait_nanos" NAME_SUFFIX,                                        \
+  {"api_wait_nanos_count" NAME_SUFFIX,                                  \
    (char*) ARRAY_LOCATION[ Ndb::WaitNanosCount ],                       \
    SHOW_LONGLONG},                                                      \
-  {"api_bytes_sent" NAME_SUFFIX,                                        \
+  {"api_bytes_sent_count" NAME_SUFFIX,                                  \
    (char*) ARRAY_LOCATION[ Ndb::BytesSentCount ],                       \
    SHOW_LONGLONG},                                                      \
-  {"api_bytes_received" NAME_SUFFIX,                                    \
+  {"api_bytes_received_count" NAME_SUFFIX,                              \
    (char*) ARRAY_LOCATION[ Ndb::BytesRecvdCount ],                      \
    SHOW_LONGLONG},                                                      \
   {"api_trans_start_count" NAME_SUFFIX,                                 \

=== modified file 'storage/ndb/src/ndbapi/NdbRecAttr.cpp'
--- a/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2011-02-09 11:15:39 +0000
@@ -182,7 +182,7 @@ ndbrecattr_print_formatted(NdbOut& out, 
   return NdbDictionary::printFormattedValue(out,
                                             f,
                                             r.getColumn(),
-                                            r.aRef());
+                                            r.isNULL()==0 ? r.aRef() : 0);
 }
 
 NdbOut& operator<<(NdbOut& out, const NdbRecAttr &r)


Attachment: [text/bzr-bundle] bzr/[e-mail]