Commit e2e6aa89 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  manual merge
parents c73db035 49f2196d

sql/ha_ndbcluster.cc

+3 −3
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ int ha_ndbcluster::get_metadata(const char *path) 
  DBUG_ASSERT(m_table == NULL);

  DBUG_ASSERT(m_table_info == NULL);



  const void *data, *pack_data;

  const void *data= NULL, *pack_data= NULL;

  uint length, pack_length;



  /*
@@ -4749,7 +4749,7 @@ int ha_ndbcluster::create(const char *name, 
  NDBTAB tab;

  NDBCOL col;

  uint pack_length, length, i, pk_length= 0;

  const void *data, *pack_data;

  const void *data= NULL, *pack_data= NULL;

  bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE);

  bool is_truncate= (thd->lex->sql_command == SQLCOM_TRUNCATE);

  char tablespace[FN_LEN];
@@ -5077,7 +5077,7 @@ int ha_ndbcluster::create_handler_files(const char *file, 
  const char *name;

  Ndb* ndb;

  const NDBTAB *tab;

  const void *data, *pack_data;

  const void *data= NULL, *pack_data= NULL;

  uint length, pack_length;

  int error= 0;