Commit 516fdb71 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.1-bug11824 

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


myisam/mi_create.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/field.cc:
  Manual merge
parents 78c81415 16ce188d

myisam/mi_create.c

+17 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
  my_off_t key_root[MI_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];

  MI_CREATE_INFO tmp_create_info;

  DBUG_ENTER("mi_create");

  DBUG_PRINT("enter", ("keys: %u  columns: %u  uniques: %u  flags: %u",

                      keys, columns, uniques, flags));



  if (!ci)

  {
@@ -471,6 +473,16 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
			       uniques * MI_UNIQUEDEF_SIZE +

			       (key_segs + unique_key_parts)*HA_KEYSEG_SIZE+

			       columns*MI_COLUMNDEF_SIZE);

  DBUG_PRINT("info", ("info_length: %u", info_length));

  /* There are only 16 bits for the total header length. */

  if (info_length > 65535)

  {

    my_printf_error(0, "MyISAM table '%s' has too many columns and/or "

                    "indexes and/or unique constraints.",

                    MYF(0), name + dirname_length(name));

    my_errno= HA_WRONG_CREATE_OPTION;

    goto err;

  }



  bmove(share.state.header.file_version,(byte*) myisam_file_magic,4);

  ci->old_options=options| (ci->old_options & HA_OPTION_TEMP_COMPRESS_RECORD ?
@@ -620,6 +632,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    errpos=3;

  }



  DBUG_PRINT("info", ("write state info and base info"));

  if (mi_state_info_write(file, &share.state, 2) ||

      mi_base_info_write(file, &share.base))

    goto err;
@@ -633,6 +646,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
#endif



  /* Write key and keyseg definitions */

  DBUG_PRINT("info", ("write key and keyseg definitions"));

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

  {

    uint sp_segs=(keydefs[i].flag & HA_SPATIAL) ? 2*SPDIMS : 0;
@@ -683,6 +697,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
  }



  /* Save unique definition */

  DBUG_PRINT("info", ("write unique definitions"));

  for (i=0 ; i < share.state.header.uniques ; i++)

  {

    HA_KEYSEG *keyseg_end;
@@ -713,6 +728,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
	goto err;

    }

  }

  DBUG_PRINT("info", ("write field definitions"));

  for (i=0 ; i < share.base.fields ; i++)

    if (mi_recinfo_write(file, &recinfo[i]))

      goto err;
@@ -727,6 +743,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
#endif



	/* Enlarge files */

  DBUG_PRINT("info", ("enlarge to keystart: %lu", (ulong) share.base.keystart));

  if (my_chsize(file,(ulong) share.base.keystart,0,MYF(0)))

    goto err;

myisam/mi_delete_table.c

+18 −6
Original line number Diff line number Diff line
@@ -34,13 +34,25 @@ int mi_delete_table(const char *name) 
#ifdef USE_RAID

  {

    MI_INFO *info;

    /* we use 'open_for_repair' to be able to delete a crashed table */

    /*

      When built with RAID support, we need to determine if this table

      makes use of the raid feature. If yes, we need to remove all raid

      chunks. This is done with my_raid_delete(). Unfortunately it is

      necessary to open the table just to check this. We use

      'open_for_repair' to be able to open even a crashed table. If even

      this open fails, we assume no raid configuration for this table

      and try to remove the normal data file only. This may however

      leave the raid chunks behind.

    */

    if (!(info= mi_open(name, O_RDONLY, HA_OPEN_FOR_REPAIR)))

      DBUG_RETURN(my_errno);

      raid_type= 0;

    else

    {

      raid_type=   info->s->base.raid_type;

      raid_chunks= info->s->base.raid_chunks;

      mi_close(info);

    }

  }

#ifdef EXTRA_DEBUG

  check_table_is_closed(name,"delete");

#endif

mysql-test/r/key.result

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

drop table t1;

create table t1 (

i1 INT NOT NULL,

i2 INT NOT NULL,

UNIQUE i1idx (i1),

UNIQUE i2idx (i2));

desc t1;

Field	Type	Null	Key	Default	Extra

i1	int(11)		UNI	0	

i2	int(11)		UNI	0	

drop table t1;

create table t1 (

c1 int,

c2 varchar(20) not null,

primary key (c1),

mysql-test/r/myisam.result

+13 −0
Original line number Diff line number Diff line
@@ -747,6 +747,19 @@ select count(id1) from t1 where id2 = 10; 
count(id1)

5

drop table t1;

CREATE TABLE t1(a TINYINT, KEY(a)) ENGINE=MyISAM;

INSERT INTO t1 VALUES(1);

SELECT MAX(a) FROM t1 IGNORE INDEX(a);

MAX(a)

1

ALTER TABLE t1 DISABLE KEYS;

SELECT MAX(a) FROM t1;

MAX(a)

1

SELECT MAX(a) FROM t1 IGNORE INDEX(a);

MAX(a)

1

DROP TABLE t1;

CREATE TABLE t1(a CHAR(9), b VARCHAR(7)) ENGINE=MyISAM;

INSERT INTO t1(a) VALUES('xxxxxxxxx'),('xxxxxxxxx');

UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb';

mysql-test/t/key.test

+11 −0
Original line number Diff line number Diff line
@@ -325,6 +325,17 @@ alter table t1 add key (c1,c2,c1); 
alter table t1 add key (c1,c1,c2);

drop table t1;



#

# Bug#11228: DESC shows arbitrary column as "PRI"

#

create table t1 (

 i1 INT NOT NULL,

 i2 INT NOT NULL,

 UNIQUE i1idx (i1),

 UNIQUE i2idx (i2));

desc t1;

drop table t1;



#

# Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE 

#             on large MyISAM table