Commit e6c667b1 authored by unknown's avatar unknown
Browse files

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 

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


sql/ha_ndbcluster.cc:
  Auto merged
parents 80e898fa 80e2c6ea

sql/ha_ndbcluster.cc

+30 −0
Original line number Diff line number Diff line
@@ -10664,6 +10664,36 @@ bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *create_info, 
    if (field->flags & FIELD_IN_ADD_INDEX)

      ai=1;

  }



  char tablespace_name[FN_LEN]; 

  if (get_tablespace_name(current_thd, tablespace_name, FN_LEN))

  {

    if (create_info->tablespace) 

    {

      if (strcmp(create_info->tablespace, tablespace_name))

      {

        DBUG_PRINT("info", ("storage media is changed, old tablespace=%s, new tablespace=%s",

          tablespace_name, create_info->tablespace));

        DBUG_RETURN(COMPATIBLE_DATA_NO);

      }

    }

    else

    {

      DBUG_PRINT("info", ("storage media is changed, old is DISK and tablespace=%s, new is MEM",

        tablespace_name));

      DBUG_RETURN(COMPATIBLE_DATA_NO);

    }

  }

  else

  {

    if (create_info->storage_media != HA_SM_MEMORY)

    {

      DBUG_PRINT("info", ("storage media is changed, old is MEM, new is DISK and tablespace=%s",

        create_info->tablespace));

      DBUG_RETURN(COMPATIBLE_DATA_NO);

    }

  }



  if (table_changes != IS_EQUAL_YES)

    DBUG_RETURN(COMPATIBLE_DATA_NO);