Commit 05527cfc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release 

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build


configure.in:
  Auto merged
parents 7118b2c3 1c24fc31

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -2516,9 +2516,9 @@ linked_client_targets="linked_libmysql_sources" 


if test "$THREAD_SAFE_CLIENT" = "no"

then

  sql_client_dirs="strings regex mysys extra libmysql client"

  sql_client_dirs="strings regex mysys dbug extra libmysql client"

else

  sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"

  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"

  linked_client_targets="$linked_client_targets linked_libmysql_r_sources"

  AC_CONFIG_FILES(libmysql_r/Makefile)

  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])

myisam/mi_packrec.c

+1 −1
Original line number Diff line number Diff line
@@ -592,8 +592,8 @@ static uint copy_decode_table(uint16 *to_pos, uint offset, 
			      uint16 *decode_table)

{

  uint prev_offset;

  prev_offset= offset;

  DBUG_ENTER("copy_decode_table");

  prev_offset= offset;



  /* Descent on the left side. */

  if (!(*decode_table & IS_CHAR))

sql/ha_ndbcluster.cc

+9 −16
Original line number Diff line number Diff line
@@ -6109,32 +6109,25 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, 


    DBUG_RETURN(0);

retry:

    if(report_error)



    {

      if (file)

      ndb->closeTransaction(pTrans);

      pTrans= NULL;

    }

    if (error.status == NdbError::TemporaryError && retries--)

    {

        reterr= file->ndb_err(pTrans);

      my_sleep(retry_sleep);

      continue;

    }

      else

    if(report_error)

    {

      const NdbError& tmp= error;

      ERR_PRINT(tmp);

      reterr= ndb_to_mysql_error(&tmp);

    }

    }

    else

      reterr= error.code;



    if (pTrans)

    {

      ndb->closeTransaction(pTrans);

      pTrans= NULL;

    }

    if (error.status == NdbError::TemporaryError && retries--)

    {

      my_sleep(retry_sleep);

      continue;

    }

    break;

  } while(1);

  DBUG_PRINT("exit", ("failed, reterr: %u, NdbError %u(%s)", reterr,