Commit 467b6dc4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1-push
parents af0287be 777899a6

myisam/mi_check.c

+8 −0
Original line number Diff line number Diff line
@@ -3870,6 +3870,14 @@ int update_state_info(MI_CHECK *param, MI_INFO *info,uint update) 
      if (!share->state.create_time)

	share->state.create_time=share->state.check_time;

    }

    /*

      When tables are locked we haven't synched the share state and the

      real state for a while so we better do it here before synching

      the share state to disk. Only when table is write locked is it

      necessary to perform this synch.

    */

    if (info->lock_type == F_WRLCK)

      share->state.state= *info->state;

    if (mi_state_info_write(share->kfile,&share->state,1+2))

      goto err;

    share->changed=0;

myisam/mi_key.c

+3 −3
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
    pos= (byte*) record+keyseg->start;

    if (keyseg->flag & HA_SPACE_PACK)

    {

      FIX_LENGTH(cs, pos, length, char_length);

      end= pos + char_length;

      end= pos + length;

      if (type != HA_KEYTYPE_NUM)

      {

	while (end > pos && end[-1] == ' ')
@@ -96,7 +95,8 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
	while (pos < end && pos[0] == ' ')

	  pos++;

      }

      char_length= (uint) (end - pos);

      length=(uint) (end-pos);

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      memcpy((byte*) key,(byte*) pos,(size_t) char_length);

      key+=char_length;

myisam/mi_rnext_same.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) 
			       info->lastkey_length,SEARCH_BIGGER,

			       info->s->state.key_root[inx])))

          break;

        if (ha_key_cmp(keyinfo->seg,info->lastkey2,info->lastkey,

        if (ha_key_cmp(keyinfo->seg, info->lastkey, info->lastkey2,

                       info->last_rkey_length, SEARCH_FIND, &not_used))

        {

          error=1;

mysql-test/r/analyze.result

0 → 100644
+32 −0
Original line number Diff line number Diff line 
create table t1 (a bigint);

lock tables t1 write;

insert into t1 values(0);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

unlock tables;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a bigint);

insert into t1 values(0);

lock tables t1 write;

delete from t1;

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

unlock tables;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a bigint);

insert into t1 values(0);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

mysql-test/r/ctype_utf8.result

+3 −0
Original line number Diff line number Diff line
@@ -901,4 +901,7 @@ insert into t1 values (2,'Durban'); 
select * from t1 where city = 'Durban';

id	city

2	Durban

select * from t1 where city = 'Durban ';

id	city

2	Durban

drop table t1;