Commit 2e219863 authored by unknown's avatar unknown
Browse files

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

into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
parents 72bff0c9 84000c37

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_check.c

+6 −3
Original line number Diff line number Diff line
@@ -1370,7 +1370,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param,new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param,new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    info->s->state.dellink= HA_OFFSET_ERROR;
@@ -2072,7 +2073,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)
@@ -2440,7 +2442,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)

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 */