Commit dbcf3b3a authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

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

into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents 6c00006d 68899dec
...@@ -2575,6 +2575,7 @@ row_drop_table_for_mysql( ...@@ -2575,6 +2575,7 @@ row_drop_table_for_mysql(
foreign = UT_LIST_GET_FIRST(table->referenced_list); foreign = UT_LIST_GET_FIRST(table->referenced_list);
while (foreign && foreign->foreign_table == table) { while (foreign && foreign->foreign_table == table) {
check_next_foreign:
foreign = UT_LIST_GET_NEXT(referenced_list, foreign); foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
} }
...@@ -2603,6 +2604,10 @@ row_drop_table_for_mysql( ...@@ -2603,6 +2604,10 @@ row_drop_table_for_mysql(
goto funct_exit; goto funct_exit;
} }
if (foreign && trx->check_foreigns) {
goto check_next_foreign;
}
if (table->n_mysql_handles_opened > 0) { if (table->n_mysql_handles_opened > 0) {
ibool added; ibool added;
......
...@@ -1235,6 +1235,20 @@ show columns from t2; ...@@ -1235,6 +1235,20 @@ show columns from t2;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a varchar(3) YES NULL a varchar(3) YES NULL
drop table t2, t1; 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); create table t1 ( id int not null auto_increment, primary key (id), col1 int);
insert into t1 (col1) values (2),(3),(4),(5),(6); insert into t1 (col1) values (2),(3),(4),(5),(6);
select 99 union all select id from t1 order by 1; select 99 union all select id from t1 order by 1;
......
...@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1; ...@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1;
show columns from t2; show columns from t2;
drop table t2, t1; 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 # Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
......
...@@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table) ...@@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table)
enum_set_typelib, collation.collation); enum_set_typelib, collation.collation);
case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_VAR_STRING:
table->db_create_options|= HA_OPTION_PACK_RECORD; table->db_create_options|= HA_OPTION_PACK_RECORD;
return new Field_string(max_length, maybe_null, name, table, fld_type= MYSQL_TYPE_STRING;
collation.collation); break;
default: default:
break; break;
} }
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
Name: MySQL Name: MySQL
Summary: MySQL: a very fast and reliable SQL database server Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL: Um servidor SQL rpido e confivel. Summary(pt_BR): MySQL: Um servidor SQL rápido e confiável.
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Version: @MYSQL_NO_DASH_VERSION@ Version: @MYSQL_NO_DASH_VERSION@
Release: %{release} Release: %{release}
License: GPL License: GPL
...@@ -57,8 +57,8 @@ documentation and the manual for more information. ...@@ -57,8 +57,8 @@ documentation and the manual for more information.
Release: %{release} Release: %{release}
Summary: MySQL: a very fast and reliable SQL database server Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL: Um servidor SQL rpido e confivel. Summary(pt_BR): MySQL: Um servidor SQL rápido e confiável.
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Requires: fileutils sh-utils Requires: fileutils sh-utils
Provides: msqlormysql mysql-server mysql MySQL Provides: msqlormysql mysql-server mysql MySQL
Obsoletes: MySQL mysql mysql-server Obsoletes: MySQL mysql mysql-server
...@@ -92,7 +92,7 @@ Release: %{release} ...@@ -92,7 +92,7 @@ Release: %{release}
Summary: MySQL - Client Summary: MySQL - Client
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Cliente Summary(pt_BR): MySQL - Cliente
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Obsoletes: mysql-client Obsoletes: mysql-client
Provides: mysql-client Provides: mysql-client
...@@ -102,7 +102,7 @@ This package contains the standard MySQL clients and administration tools. ...@@ -102,7 +102,7 @@ This package contains the standard MySQL clients and administration tools.
%{see_base} %{see_base}
%description client -l pt_BR %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 %package ndb-storage
Release: %{release} Release: %{release}
...@@ -156,8 +156,8 @@ Release: %{release} ...@@ -156,8 +156,8 @@ Release: %{release}
Requires: %{name}-client perl-DBI perl Requires: %{name}-client perl-DBI perl
Summary: MySQL - Benchmarks and test system Summary: MySQL - Benchmarks and test system
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Medies de desempenho Summary(pt_BR): MySQL - Medições de desempenho
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Provides: mysql-bench Provides: mysql-bench
Obsoletes: mysql-bench Obsoletes: mysql-bench
...@@ -167,14 +167,14 @@ This package contains MySQL benchmark scripts and data. ...@@ -167,14 +167,14 @@ This package contains MySQL benchmark scripts and data.
%{see_base} %{see_base}
%description bench -l pt_BR %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 %package devel
Release: %{release} Release: %{release}
Summary: MySQL - Development header files and libraries Summary: MySQL - Development header files and libraries
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Medies de desempenho Summary(pt_BR): MySQL - Medições de desempenho
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Provides: mysql-devel Provides: mysql-devel
Obsoletes: mysql-devel Obsoletes: mysql-devel
...@@ -185,8 +185,8 @@ necessary to develop MySQL client applications. ...@@ -185,8 +185,8 @@ necessary to develop MySQL client applications.
%{see_base} %{see_base}
%description devel -l pt_BR %description devel -l pt_BR
Este pacote contm os arquivos de cabealho (header files) e bibliotecas Este pacote contém os arquivos de cabeçalho (header files) e bibliotecas
necessrias para desenvolver aplicaes clientes do MySQL. necessárias para desenvolver aplicações clientes do MySQL.
%package shared %package shared
Release: %{release} Release: %{release}
...@@ -226,8 +226,8 @@ Release: %{release} ...@@ -226,8 +226,8 @@ Release: %{release}
Requires: %{name}-devel Requires: %{name}-devel
Summary: MySQL - embedded library Summary: MySQL - embedded library
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Medies de desempenho Summary(pt_BR): MySQL - Medições de desempenho
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Obsoletes: mysql-embedded Obsoletes: mysql-embedded
%description embedded %description embedded
...@@ -364,6 +364,9 @@ fi ...@@ -364,6 +364,9 @@ fi
(cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*) (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)
(cd libmysql_r/.libs; tar rf $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 # 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) # patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
...@@ -689,6 +692,10 @@ fi ...@@ -689,6 +692,10 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %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> * Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
- Enabled the "blackhole" storage engine for the Max RPM - Enabled the "blackhole" storage engine for the Max RPM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment