Commit 064c1b29 authored by unknown's avatar unknown
Browse files

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

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
parents 5d92d2d7 dbf4dc3d

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -2438,9 +2438,9 @@ AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no") 


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 the client be thread safe])

storage/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))