Commit a10739e5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_yacc.yy:
  Auto merged
parents 7efa8d9b 6e4c74c1

myisam/mi_search.c

+23 −9
Original line number Diff line number Diff line
@@ -318,19 +318,21 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, 
  get_key_pack_length(kseg_len,length_pack,kseg);

  key_len_skip=length_pack+kseg_len;

  key_len_left=(int) key_len- (int) key_len_skip;

  /* If key_len is 0, then lenght_pack is 1, then key_len_left is -1. */

  cmplen=(key_len_left>=0) ? kseg_len : key_len-length_pack;

  DBUG_PRINT("info",("key: '%.*s'",kseg_len,kseg));



  /*

    Keys are compressed the following way:



    If the max length of first key segment <= 127 characters the prefix is

    If the max length of first key segment <= 127 bytes the prefix is

    1 byte else it's 2 byte



    prefix         The high bit is set if this is a prefix for the prev key

    length         Packed length if the previous was a prefix byte

    [length]       Length character of data

    next-key-seg   Next key segments

    (prefix) length  The high bit is set if this is a prefix for the prev key.

    [suffix length]  Packed length of suffix if the previous was a prefix.

    (suffix) data    Key data bytes (past the common prefix or whole segment).

    [next-key-seg]   Next key segments (([packed length], data), ...)

    pointer          Reference to the data file (last_keyseg->length).

  */



  matched=0;  /* how many char's from prefix were alredy matched */
@@ -351,16 +353,23 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, 


    if (packed)

    {

      if (suffix_len == 0)                      /* Same key */

      if (suffix_len == 0)

      {

        /* == 0x80 or 0x8000, same key, prefix length == old key length. */

        prefix_len=len;

      }

      else

      {

        /* > 0x80 or 0x8000, this is prefix lgt, packed suffix lgt follows. */

        prefix_len=suffix_len;

        get_key_length(suffix_len,vseg);

      }

    }

    else

    {

      /* Not packed. No prefix used from last key. */

      prefix_len=0;

    }



    len=prefix_len+suffix_len;

    seg_len_pack=get_pack_length(len);
@@ -417,7 +426,12 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, 
      uint  left;

      uchar *k=kseg+prefix_len;



      left=(len>cmplen) ? cmplen-prefix_len : suffix_len;

      /*

        If prefix_len > cmplen then we are in the end-space comparison

        phase. Do not try to acces the key any more ==> left= 0.

      */

      left= ((len <= cmplen) ? suffix_len :

             ((prefix_len < cmplen) ? cmplen - prefix_len : 0));



      matched=prefix_len+left;
@@ -455,7 +469,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, 
	    my_flag= -1;

	  else

	  {

	    /* We have to compare k and vseg as if they where space extended */

	    /* We have to compare k and vseg as if they were space extended */

	    uchar *end= k+ (cmplen - len);

	    for ( ; k < end && *k == ' '; k++) ;

	    if (k == end)
@@ -474,7 +488,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, 
	  if ((nextflag & SEARCH_PREFIX) && key_len_left == 0)

	    goto fix_flag;



	  /* We have to compare k and vseg as if they where space extended */

	  /* We have to compare k and vseg as if they were space extended */

	  for (end=vseg + (len-cmplen) ;

	       vseg < end && *vseg == (uchar) ' ';

	       vseg++, matched++) ;

mysql-test/r/alter_table.result

+15 −0
Original line number Diff line number Diff line
@@ -537,3 +537,18 @@ create table t1 ( a timestamp ); 
alter table t1 add unique ( a(1) );

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

drop table t1;

create database mysqltest1;

create table t1 (c1 int);

alter table t1 rename mysqltest1.t1;

drop table t1;

ERROR 42S02: Unknown table 't1'

alter table mysqltest1.t1 rename t1;

drop table t1;

create table t1 (c1 int);

use mysqltest1;

drop database mysqltest1;

alter table test.t1 rename t1;

ERROR 3D000: No database selected

alter table test.t1 rename test.t1;

use test;

drop table t1;

mysql-test/r/innodb.result

+17 −1
Original line number Diff line number Diff line
@@ -1703,6 +1703,22 @@ a_id b_list 
3	NULL

DROP TABLE t2;

DROP TABLE t1;

create temporary table t1 (a int) engine=innodb;

insert into t1 values (4711);

truncate t1;

insert into t1 values (42);

select * from t1;

a

42

drop table t1;

create table t1 (a int) engine=innodb;

insert into t1 values (4711);

truncate t1;

insert into t1 values (42);

select * from t1;

a

42

drop table t1;

create table t1 (x bigint unsigned not null primary key) engine=innodb;

insert into t1(x) values (0xfffffffffffffff0),(0xfffffffffffffff1);

select * from t1;
@@ -1749,7 +1765,7 @@ Variable_name Value 
Innodb_rows_deleted	2070

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	31718

Innodb_rows_inserted	31722

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	29530

mysql-test/r/key.result

+17 −0
Original line number Diff line number Diff line
@@ -329,6 +329,23 @@ ERROR 42S21: Duplicate column name 'c1' 
alter table t1 add key (c1,c1,c2);

ERROR 42S21: Duplicate column name 'c1'

drop table t1;

create table t1 (

c1 int,

c2 varchar(20) not null,

primary key (c1),

key (c2(10))

) engine=myisam;

insert into t1 values (1,'');

insert into t1 values (2,' \t\tTest String');

insert into t1 values (3,' \n\tTest String');

update t1 set c2 = 'New Test String' where c1 = 1;

select * from t1;

c1	c2

1	New Test String

2	 		Test String

3	 

	Test String

drop table t1;

create table t1 (a varchar(10), b varchar(10), key(a(10),b(10)));

show create table t1;

Table	Create Table

mysql-test/r/myisam.result

+20 −0
Original line number Diff line number Diff line
@@ -594,6 +594,20 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (c1 int);

insert into t1 values (1),(2),(3),(4);

checksum table t1;

Table	Checksum

test.t1	149057747

delete from t1 where c1 = 1;

create table t2 as select * from t1;

checksum table t1;

Table	Checksum

test.t1	984116287

checksum table t2;

Table	Checksum

test.t2	984116287

drop table t1, t2;

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;

--- Testing varchar ---
@@ -1274,3 +1288,9 @@ show keys from t1; 
Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE	

drop table t1;

create table t1 (c1 int) engine=myisam pack_keys=0;

create table t2 (c1 int) engine=myisam pack_keys=1;

create table t3 (c1 int) engine=myisam pack_keys=default;

create table t4 (c1 int) engine=myisam pack_keys=2;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1

drop table t1, t2, t3;