Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge

sql/ha_ndbcluster.cc

@@ -3915,6 +3915,8 @@ int ha_ndbcluster::extra(enum ha_extra_function operation)
     DBUG_PRINT("info", ("HA_EXTRA_UPDATE_CANNOT_BATCH"));
     m_update_cannot_batch= TRUE;
     break;
+  default:
+    break;
   }
   
   DBUG_RETURN(0);

sql/sql_trigger.h

@@ -113,7 +113,7 @@ public:
   bool has_triggers(trg_event_type event_type, 
                     trg_action_time_type action_time)
   {
-    return (bodies[event_type][action_time]);
+    return (bodies[event_type][action_time] != NULL);
   }
   bool has_delete_triggers()
   {