bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4928 to 4929) Bug#14106592

[magnus.blaudd]

 4929 magnus.blaudd@stripped	2012-05-23
      Bug#14106592 DEBUG BUILD CRASH IN NDB_SERIALIZE_COND()
       - Use Item::print to print the value of Item_* to String
       before printing to DBUG log
      - NOTE! 7.2 has one more place which need same fix

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster_cond.cc
 4928 magnus.blaudd@stripped	2012-05-23
      Bug#14107173 CONNECT WITH TIMEOUT DOES NOT SET SOCKET BACK TO BLOCKING
       - Set socket back to blocking mode after connect finish

    modified:
      storage/ndb/src/common/util/SocketClient.cpp
=== 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;

No bundle (reason: useless for push emails).