Commit 7b7cabcb authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 3307de72 3b1a0c87

client/mysqltest.c

+30 −0
Original line number Diff line number Diff line
@@ -5088,6 +5088,35 @@ static void init_var_hash(MYSQL *mysql) 
  DBUG_VOID_RETURN;

}



static void mark_progress(int line)

{

#ifdef NOT_YET

  static FILE* fp = NULL;

  static double first;



  struct timeval tv;

  double now;



  if (!fp)

  {



    fp = fopen("/tmp/mysqltest_progress.log", "wt");



    if (!fp)

    {

      abort();

    }



    gettimeofday(&tv, NULL);

    first = tv.tv_sec * 1e6 + tv.tv_usec;

  }



  gettimeofday(&tv, NULL);

  now = tv.tv_sec * 1e6 + tv.tv_usec;



  fprintf(fp, "%d %f\n", parser.current_line, (now - first) / 1e6);

#endif

}



int main(int argc, char **argv)

{
@@ -5447,6 +5476,7 @@ int main(int argc, char **argv) 
    }



    parser.current_line += current_line_inc;

    mark_progress(parser.current_line);

  }



  start_lineno= 0;

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -557,8 +557,6 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans) 
  switch (err.classification) {

  case NdbError::SchemaError:

  {

    invalidate_dictionary_cache(TRUE);



    /* Close other open handlers not used by any thread */

    TABLE_LIST table_list;

    bzero((char*) &table_list,sizeof(table_list));
@@ -566,6 +564,8 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans) 
    table_list.alias= table_list.table_name= m_tabname;

    close_cached_tables(current_thd, 0, &table_list);



    invalidate_dictionary_cache(TRUE);



    if (err.code==284)

    {

      /*

sql/udf_example.cc

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result, 
	}

    }

  }

  *length= (ulong) (max(0, result - org_result - 1));

  *length= (unsigned long) (result - org_result);

  return org_result;

}