Commit 0679e0a6 authored by unknown's avatar unknown
Browse files

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:
  Auto merged
parents 02a7bdc4 b8ea75c8

sql/ha_ndbcluster.cc

+2 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class Table_triggers_list: public Sql_alloc 
  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()

  {