Commit b8ea75c8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents 33ad8991 73748930
Loading
Loading
Loading
Loading
+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);