Commit 6d76c8f3 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
myisam/mi_packrec.c:
  Use fix by Magnus.
parents 644e6c7f 87a569f3

cmd-line-utils/readline/undo.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end) 


  for (rl = rl_undo_list; rl; rl = rl->next)

    {

      if (rl->what == (uint) type)

      if (rl->what == (unsigned int) type)

	{

	  rl->start = start;

	  rl->end = end;

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])

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -6111,7 +6111,7 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, 
retry:

    if(report_error)

    {

      if (file)

      if (file && pTrans)

      {

        reterr= file->ndb_err(pTrans);

      }