Commit 5f767b11 authored by unknown's avatar unknown
Browse files

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

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item.cc:
  Auto merged
parents ab88a1d2 7c066496

innobase/row/row0mysql.c

+5 −0
Original line number Diff line number Diff line
@@ -2575,6 +2575,7 @@ row_drop_table_for_mysql( 
	foreign = UT_LIST_GET_FIRST(table->referenced_list);

	

	while (foreign && foreign->foreign_table == table) {

	check_next_foreign:

		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);

	}
@@ -2603,6 +2604,10 @@ row_drop_table_for_mysql( 
		goto funct_exit;

	}



	if (foreign && trx->check_foreigns) {

		goto check_next_foreign;

	}



	if (table->n_mysql_handles_opened > 0) {

		ibool	added;

mysql-test/r/union.result

+14 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,20 @@ show columns from t2; 
Field	Type	Null	Key	Default	Extra

a	varchar(3)	YES		NULL	

drop table t2, t1;

CREATE TABLE t1 (a mediumtext);

CREATE TABLE t2 (b varchar(20));

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

SELECT left(a,100000000) FROM t1 UNION  SELECT b FROM t2;

left(a,100000000)

a

b

create table t3 SELECT left(a,100000000) FROM t1 UNION  SELECT b FROM t2;

show create table t3;

Table	Create Table

t3	CREATE TABLE `t3` (

  `left(a,100000000)` longtext

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop tables t1,t2,t3;

create table t1 ( id int not null auto_increment, primary key (id), col1 int);

insert into t1 (col1) values (2),(3),(4),(5),(6);

select 99 union all select id from t1 order by 1;

mysql-test/t/union.test

+10 −0
Original line number Diff line number Diff line
@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1; 
show columns from t2;

drop table t2, t1;



#

# correct conversion long string to TEXT (BUG#10025)

#

CREATE TABLE t1 (a mediumtext);

CREATE TABLE t2 (b varchar(20));

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

SELECT left(a,100000000) FROM t1 UNION  SELECT b FROM t2;

create table t3 SELECT left(a,100000000) FROM t1 UNION  SELECT b FROM t2;

show create table t3;

drop tables t1,t2,t3;



#

# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM

sql/item.cc

+2 −2
Original line number Diff line number Diff line
@@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table) 
                         enum_set_typelib, collation.collation);

  case MYSQL_TYPE_VAR_STRING:

    table->db_create_options|= HA_OPTION_PACK_RECORD;

    return new Field_string(max_length, maybe_null, name, table,

                            collation.collation);

    fld_type= MYSQL_TYPE_STRING;

    break;

  default:

    break;

  }

support-files/mysql.spec.sh

+22 −15
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
Name: MySQL

Summary:	MySQL: a very fast and reliable SQL database server

Group:		Applications/Databases

Summary(pt_BR): MySQL: Um servidor SQL rpido e confivel.

Group(pt_BR):	Aplicaes/Banco_de_Dados

Summary(pt_BR): MySQL: Um servidor SQL rápido e confiável.

Group(pt_BR):	Aplicações/Banco_de_Dados

Version:	@MYSQL_NO_DASH_VERSION@

Release:	%{release}

License:	GPL
@@ -57,8 +57,8 @@ documentation and the manual for more information. 
Release: %{release}

Summary:	MySQL: a very fast and reliable SQL database server

Group:		Applications/Databases

Summary(pt_BR): MySQL: Um servidor SQL rpido e confivel.

Group(pt_BR):	Aplicaes/Banco_de_Dados

Summary(pt_BR): MySQL: Um servidor SQL rápido e confiável.

Group(pt_BR):	Aplicações/Banco_de_Dados

Requires: fileutils sh-utils

Provides:	msqlormysql mysql-server mysql MySQL

Obsoletes:	MySQL mysql mysql-server
@@ -92,7 +92,7 @@ Release: %{release} 
Summary: MySQL - Client

Group: Applications/Databases

Summary(pt_BR): MySQL - Cliente

Group(pt_BR): Aplicaes/Banco_de_Dados

Group(pt_BR): Aplicações/Banco_de_Dados

Obsoletes: mysql-client

Provides: mysql-client
@@ -102,7 +102,7 @@ This package contains the standard MySQL clients and administration tools. 
%{see_base}



%description client -l pt_BR

Este pacote contm os clientes padro para o MySQL.

Este pacote contém os clientes padrão para o MySQL.



%package ndb-storage

Release: %{release}
@@ -156,8 +156,8 @@ Release: %{release} 
Requires: %{name}-client perl-DBI perl

Summary: MySQL - Benchmarks and test system

Group: Applications/Databases

Summary(pt_BR): MySQL - Medies de desempenho

Group(pt_BR): Aplicaes/Banco_de_Dados

Summary(pt_BR): MySQL - Medições de desempenho

Group(pt_BR): Aplicações/Banco_de_Dados

Provides: mysql-bench

Obsoletes: mysql-bench
@@ -167,14 +167,14 @@ This package contains MySQL benchmark scripts and data. 
%{see_base}



%description bench -l pt_BR

Este pacote contm medies de desempenho de scripts e dados do MySQL.

Este pacote contém medições de desempenho de scripts e dados do MySQL.



%package devel

Release: %{release}

Summary: MySQL - Development header files and libraries

Group: Applications/Databases

Summary(pt_BR): MySQL - Medies de desempenho

Group(pt_BR): Aplicaes/Banco_de_Dados

Summary(pt_BR): MySQL - Medições de desempenho

Group(pt_BR): Aplicações/Banco_de_Dados

Provides: mysql-devel

Obsoletes: mysql-devel
@@ -185,8 +185,8 @@ necessary to develop MySQL client applications. 
%{see_base}



%description devel -l pt_BR

Este pacote contm os arquivos de cabealho (header files) e bibliotecas 

necessrias para desenvolver aplicaes clientes do MySQL. 

Este pacote contém os arquivos de cabeçalho (header files) e bibliotecas 

necessárias para desenvolver aplicações clientes do MySQL. 



%package shared

Release: %{release}
@@ -226,8 +226,8 @@ Release: %{release} 
Requires: %{name}-devel

Summary: MySQL - embedded library

Group: Applications/Databases

Summary(pt_BR): MySQL - Medies de desempenho

Group(pt_BR): Aplicaes/Banco_de_Dados

Summary(pt_BR): MySQL - Medições de desempenho

Group(pt_BR): Aplicações/Banco_de_Dados

Obsoletes: mysql-embedded



%description embedded
@@ -364,6 +364,9 @@ fi 
(cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)

(cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*)



# Now clean up

make clean



#

# Only link statically on our i386 build host (which has a specially

# patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
@@ -689,6 +692,10 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>



- Added a "make clean" between separate calls to "BuildMySQL".



* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>



- Enabled the "blackhole" storage engine for the Max RPM