bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3925 to 3926) Bug#14106592

[magnus.blaudd]

 3926 magnus.blaudd@stripped	2012-05-23 [merge]
      Merge 7.1 -> 7.2
      Fixed the other place in ha_ndbcluster_cond for BUG#14106592

    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
 3925 Bernd Ocklin	2012-05-23
      fix obsoletes to allow mysql dependend products to be installed with mysql cluster server

    modified:
      support-files/mysql.spec.sh
=== modified file 'mysql-test/suite/ndb/r/ndb_condition_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2012-02-23 15:41:31 +0000
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2012-05-23 12:43:48 +0000
@@ -2422,3 +2422,11 @@ test_data@stripped	1
 drop table escapetest;
 set @@session.optimizer_switch = @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-02-23 15:41:31 +0000
+++ b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2012-05-23 12:43:48 +0000
@@ -2437,3 +2437,11 @@ drop table escapetest;
 set @@session.optimizer_switch = @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-02-23 15:41:31 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2012-05-23 12:43:48 +0000
@@ -766,11 +766,9 @@ ndb_serialize_cond(const Item *item, voi
           {
 #ifndef DBUG_OFF
             char buff[256];
-            String str(buff,0, system_charset_info);
-            //str.length(0);// Magnus
-            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;
@@ -1029,11 +1027,9 @@ ndb_serialize_cond(const Item *item, voi
             {
   #ifndef DBUG_OFF
               char buff[256];
-              String str(buff,0, system_charset_info);
-              //str.length(0);// Magnus
-              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).