bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4545 to 4546)

[magnus.blaudd]

 4546 magnus.blaudd@stripped	2012-05-23 [merge]
      Merge 7.0 -> 7.1

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster_cond.cc
      storage/ndb/src/common/util/SocketClient.cpp
 4545 Frazer Clement	2012-05-21 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/signaldata/LCP.hpp
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/src/common/debugger/signaldata/LCP.cpp
      storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/test/include/NdbMgmd.hpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/run-test/daily-devel-tests.txt
=== modified file 'mysql-test/suite/ndb/r/ndb_condition_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2012-01-24 13:10:16 +0000
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2012-05-23 12:31:34 +0000
@@ -2416,3 +2416,11 @@ test_data@stripped	1
 drop table escapetest;
 set engine_condition_pushdown = @old_ecpd;
 DROP TABLE t1,t2,t3,t4,t5;
+#
+# Bug#14106592  DEBUG BUILD CRASH IN NDB_SERIALIZE_COND()
+#
+create table t1(a time) engine=ndbcluster;
+insert into t1 values ('00:00:00'),('01:01:01');
+select 1 from t1 where a >= geomfromtext('1');
+1
+drop table t1;

=== modified file 'mysql-test/suite/ndb/t/ndb_condition_pushdown.test'
--- a/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2012-01-24 13:10:16 +0000
+++ b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2012-05-23 12:31:34 +0000
@@ -2435,3 +2435,12 @@ drop table escapetest;
 
 set engine_condition_pushdown = @old_ecpd;
 DROP TABLE t1,t2,t3,t4,t5;
+
+--echo #
+--echo # Bug#14106592  DEBUG BUILD CRASH IN NDB_SERIALIZE_COND()
+--echo #
+create table t1(a time) engine=ndbcluster;
+insert into t1 values ('00:00:00'),('01:01:01');
+select 1 from t1 where a >= geomfromtext('1');
+drop table t1;
+

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2012-01-24 13:10:16 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2012-05-23 12:31:34 +0000
@@ -765,11 +765,9 @@ void ndb_serialize_cond(const Item *item
           {
 #ifndef DBUG_OFF
             char buff[256];
-            String str(buff,(uint32) sizeof(buff), system_charset_info);
-            str.length(0);
-            Item_string *string_item= (Item_string *) item;
-            DBUG_PRINT("info", ("value \"%s\"", 
-                                string_item->val_str(&str)->ptr()));
+            String str(buff, 0, system_charset_info);
+            const_cast<Item*>(item)->print(&str, QT_ORDINARY);
+            DBUG_PRINT("info", ("value: '%s'", str.c_ptr_safe()));
 #endif
             NDB_ITEM_QUALIFICATION q;
             q.value_type= Item::STRING_ITEM;

=== modified file 'storage/ndb/src/common/util/SocketClient.cpp'
--- a/storage/ndb/src/common/util/SocketClient.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/util/SocketClient.cpp	2012-05-23 11:45:13 +0000
@@ -189,7 +189,7 @@ SocketClient::connect(const char *toaddr
   }
 
 done:
-  if (my_socket_nonblock(m_sockfd, true) < 0)
+  if (my_socket_nonblock(m_sockfd, false) < 0)
   {
     my_socket_close(m_sockfd);
     my_socket_invalidate(&m_sockfd);

No bundle (reason: useless for push emails).