Commit d06745a8 authored by unknown's avatar unknown
Browse files

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.0
parents cda50afc dab27eaa

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
*.vcproj

*/*.dir/*

*/*_pure_*warnings

*/.deps

*/.libs/*

*/.pure

*/debug/*

*/release/*

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


noinst_SCRIPTS =	Support/generate-text-files.pl



EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY

EXTRA_DIST =		$(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY



TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,7 @@ EOF 
    #

    echo -n "making sure specific build files are writable... "

    for file in \

        Docs/manual.chm \

        Docs/mysql.info \

        Docs/INSTALL-BINARY \

        INSTALL-SOURCE \

include/my_base.h

+3 −1
Original line number Diff line number Diff line
@@ -357,8 +357,10 @@ enum ha_base_keytype { 
#define HA_ERR_TABLE_DEF_CHANGED 159  /* The table changed in storage engine */

#define HA_ERR_TABLE_NEEDS_UPGRADE 160  /* The table changed in storage engine */

#define HA_ERR_TABLE_READONLY    161  /* The table is not writable */

#define HA_ERR_AUTOINC_READ_FAILED 162/* Failed to get the next autoinc value */

#define HA_ERR_AUTOINC_ERANGE    163  /* Failed to set the row autoinc value */



#define HA_ERR_LAST              161  /*Copy last error nr.*/

#define HA_ERR_LAST              163  /*Copy last error nr.*/

/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

myisam/mi_packrec.c

+14 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


	/* Functions to compressed records */



#include "myisamdef.h"

#include "fulltext.h"



#define IS_CHAR ((uint) 32768)		/* Bit if char (not offset) in tree */
@@ -230,11 +230,19 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys) 
  {

    for (i=0 ; i < share->base.keys ; i++)

    {

      share->keyinfo[i].keylength+=(uint16) diff_length;

      share->keyinfo[i].minlength+=(uint16) diff_length;

      share->keyinfo[i].maxlength+=(uint16) diff_length;

      share->keyinfo[i].seg[share->keyinfo[i].keysegs].length=

	(uint16) rec_reflength;

      MI_KEYDEF *keyinfo= &share->keyinfo[i];

      keyinfo->keylength+= (uint16) diff_length;

      keyinfo->minlength+= (uint16) diff_length;

      keyinfo->maxlength+= (uint16) diff_length;

      keyinfo->seg[keyinfo->flag & HA_FULLTEXT ?

                   FT_SEGS : keyinfo->keysegs].length= (uint16) rec_reflength;

    }

    if (share->ft2_keyinfo.seg)

    {

      MI_KEYDEF *ft2_keyinfo= &share->ft2_keyinfo;

      ft2_keyinfo->keylength+= (uint16) diff_length;

      ft2_keyinfo->minlength+= (uint16) diff_length;

      ft2_keyinfo->maxlength+= (uint16) diff_length;

    }

  }