Commit 5fa93a13 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
parents f9d6463f baf90cc0

BitKeeper/triggers/post-commit

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ then 
fi



CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`
@@ -52,6 +53,7 @@ List-ID: <bk.mysql-$VERSION> 
From: $FROM

To: $TO

Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}

X-CSetKey: <$CSETKEY>

$BH

EOF

  bk changes -v -r+
@@ -68,6 +70,7 @@ List-ID: <bk.mysql-$VERSION> 
From: $FROM

To: $INTERNALS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

X-CSetKey: <$CSETKEY>

$BH

Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

client/mysqlcheck.c

+2 −1
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ static void print_result() 
  my_bool found_error=0;



  res = mysql_use_result(sock);



  prev[0] = '\0';

  for (i = 0; (row = mysql_fetch_row(res)); i++)

  {
@@ -595,7 +596,7 @@ static void print_result() 
    putchar('\n');

  }

  if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&

      (!opt_fast || strcmp(row[3],"OK")))

      !opt_fast)

    insert_dynamic(&tables4repair, prev);

  mysql_free_result(res);

}

configure.in

+9 −0
Original line number Diff line number Diff line
@@ -351,6 +351,15 @@ then 
  if echo $CXX | grep gcc > /dev/null 2>&1

  then

    GCC_VERSION=`gcc -v 2>&1 | grep version | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`

    case $SYSTEM_TYPE in

      *freebsd*)

        # The libsupc++ library on freebsd with gcc 3.4.2 is dependent on 

        # libstdc++, disable it  since other solution works fine

        GCC_VERSION="NOSUPCPP_$GCC_VERSION"

      ;;

      *) 

      ;;

    esac

    echo "Using gcc version '$GCC_VERSION'"

    case "$GCC_VERSION" in

      3.4.*|3.5.*)

include/m_ctype.h

+6 −3
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ typedef struct my_charset_handler_st 
  uint    (*numchars)(struct charset_info_st *, const char *b, const char *e);

  uint    (*charpos)(struct charset_info_st *, const char *b, const char *e, uint pos);

  uint    (*well_formed_len)(struct charset_info_st *,

  			   const char *b,const char *e, uint nchars);

                             const char *b,const char *e,

                             uint nchars, int *error);

  uint    (*lengthsp)(struct charset_info_st *, const char *ptr, uint length);

  uint    (*numcells)(struct charset_info_st *, const char *b, const char *e);
@@ -349,7 +350,8 @@ int my_wildcmp_8bit(CHARSET_INFO *, 
uint my_numchars_8bit(CHARSET_INFO *, const char *b, const char *e);

uint my_numcells_8bit(CHARSET_INFO *, const char *b, const char *e);

uint my_charpos_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e,

                             uint pos, int *error);

int my_mbcharlen_8bit(CHARSET_INFO *, uint c);
@@ -367,7 +369,8 @@ int my_wildcmp_mb(CHARSET_INFO *, 
uint my_numchars_mb(CHARSET_INFO *, const char *b, const char *e);

uint my_numcells_mb(CHARSET_INFO *, const char *b, const char *e);

uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e,

                           uint pos, int *error);

uint my_instr_mb(struct charset_info_st *,

                 const char *b, uint b_length,

                 const char *s, uint s_length,

innobase/btr/btr0pcur.c

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Created 2/23/1996 Heikki Tuuri 


#include "ut0byte.h"

#include "rem0cmp.h"

#include "trx0trx.h"



/******************************************************************

Allocates memory for a persistent cursor object and initializes the cursor. */
@@ -206,7 +207,14 @@ btr_pcur_restore_position( 


	ut_a(cursor->pos_state == BTR_PCUR_WAS_POSITIONED

			|| cursor->pos_state == BTR_PCUR_IS_POSITIONED);

	ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED);

	if (cursor->old_stored != BTR_PCUR_OLD_STORED) {

		ut_print_buf(stderr, (const byte*)cursor, sizeof(btr_pcur_t));

		if (cursor->trx_if_known) {

			trx_print(stderr, cursor->trx_if_known);

		}

		

		ut_a(0);

	}



	if (cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE

	    || cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE) {