Commit 447f5de1 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
parents 55de5d6f a7970e24

sql/ha_ndbcluster.cc

+5 −4
Original line number Diff line number Diff line
@@ -1008,7 +1008,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;



  /*
@@ -4732,7 +4732,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= (create_info->table_options & HA_OPTION_CREATE_FROM_ENGINE);

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

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

  Ndb* ndb;

  const NDBTAB *tab;

  const void *data, *pack_data;

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

  uint length, pack_length;

  int error= 0;
@@ -6108,7 +6108,7 @@ int ndbcluster_discover(handlerton *hton, THD* thd, const char *db, 
  int error= 0;

  NdbError ndb_error;

  uint len;

  const void* data;

  const void* data= NULL;

  Ndb* ndb;

  char key[FN_REFLEN];

  DBUG_ENTER("ndbcluster_discover");
@@ -6187,6 +6187,7 @@ int ndbcluster_discover(handlerton *hton, THD* thd, const char *db, 


  DBUG_RETURN(0);

err:

  my_free((char*)data, MYF(MY_ALLOW_ZERO_PTR));

  if (share)

  {

    /* ndb_share reference temporary free */