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

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 

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


BitKeeper/etc/ignore:
  auto-union
sql/item_func.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
parents b2003316 e9275f47

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.26)

AM_INIT_AUTOMAKE(mysql, 5.0.27)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=26

NDB_VERSION_BUILD=27

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

myisam/mi_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key, 
	else

	{

	  DBUG_PRINT("test",("Inserting of key when deleting"));

	  if (_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos,

	  if (!_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos,

				&tmp))

	    goto err;

	  ret_value=_mi_insert(info,keyinfo,key,leaf_buff,endpos,keybuff,

myisam/myisam_ftdump.c

+1 −2
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ int main(int argc,char *argv[]) 


    if (count || stats)

    {

      doc_cnt++;

      if (strcmp(buf, buf2))

      {

        if (*buf2)
@@ -151,6 +150,7 @@ int main(int argc,char *argv[]) 
        keylen2=keylen;

        doc_cnt=0;

      }

      doc_cnt+= (subkeys >= 0 ? 1 : -subkeys);

    }

    if (dump)

    {
@@ -166,7 +166,6 @@ int main(int argc,char *argv[]) 


  if (count || stats)

  {

    doc_cnt++;

    if (*buf2)

    {

      uniq++;

myisammrg/myrg_open.c

+8 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)

{

  int save_errno,errpos=0;

  uint files=0,i,dir_length,length,key_parts;

  uint files= 0, i, dir_length, length, key_parts, min_keys= 0;

  ulonglong file_offset=0;

  char name_buff[FN_REFLEN*2],buff[FN_REFLEN],*end;

  MYRG_INFO *m_info=0;
@@ -89,7 +89,10 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
    else

      fn_format(buff, buff, "", "", 0);

    if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))

    {

      my_errno= HA_ERR_WRONG_MRG_TABLE_DEF;

      goto err;

    }

    if (!m_info)                                /* First file */

    {

      key_parts=isam->s->base.key_parts;
@@ -106,6 +109,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
        files= 0;

      }

      m_info->reclength=isam->s->base.reclength;

      min_keys= isam->s->base.keys;

      errpos=3;

    }

    m_info->open_tables[files].table= isam;
@@ -121,6 +125,8 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
    m_info->records+= isam->state->records;

    m_info->del+= isam->state->del;

    m_info->data_file_length+= isam->state->data_file_length;

    if (min_keys > isam->s->base.keys)

      min_keys= isam->s->base.keys;

    for (i=0; i < key_parts; i++)

      m_info->rec_per_key_part[i]+= (isam->s->state.rec_per_key_part[i] /

                                     m_info->tables);
@@ -138,7 +144,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
    my_errno=HA_ERR_RECORD_FILE_FULL;

    goto err;

  }

  m_info->keys= files ? isam->s->base.keys : 0;

  m_info->keys= min_keys;

  bzero((char*) &m_info->by_key,sizeof(m_info->by_key));



  /* this works ok if the table list is empty */

myisammrg/myrg_queue.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag) 
	error=my_errno;

    }

  }

  else

    my_errno= error= HA_ERR_WRONG_INDEX;

  return error;

}