Commit 27cc0204 authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/r/key.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 6e8cb4d6 89e41595

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

sql/table.cc

+0 −21
Original line number Diff line number Diff line
@@ -678,27 +678,6 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, 
      if (outparam->key_info[key].flags & HA_FULLTEXT)

	outparam->key_info[key].algorithm= HA_KEY_ALG_FULLTEXT;



      if (primary_key >= MAX_KEY && (keyinfo->flags & HA_NOSAME))

      {

	/*

	  If the UNIQUE key doesn't have NULL columns and is not a part key

	  declare this as a primary key.

	*/

	primary_key=key;

	for (i=0 ; i < keyinfo->key_parts ;i++)

	{

	  uint fieldnr= key_part[i].fieldnr;

	  if (!fieldnr ||

	      outparam->field[fieldnr-1]->null_ptr ||

	      outparam->field[fieldnr-1]->key_length() !=

	      key_part[i].length)

	  {

	    primary_key=MAX_KEY;		// Can't be used

	    break;

	  }

	}

      }



      for (i=0 ; i < keyinfo->key_parts ; key_part++,i++)

      {

	if (new_field_pack_flag <= 1)

support-files/mysql.spec.sh

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ Summary: MySQL - Benchmarks and test system 
Group: Applications/Databases

Provides: mysql-bench

Obsoletes: mysql-bench

AutoReqProv: no



%description bench

This package contains MySQL benchmark scripts and data.