Commit fe82f474 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 8a40c5c7 8a3c137b

mysql-test/r/analyse.result

+7 −0
Original line number Diff line number Diff line
@@ -102,3 +102,10 @@ select * from t1 procedure analyse(); 
Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

test.t1.v	"	\\	1	19	0	0	3.7619	NULL	ENUM('"','""','"c','\'\0\\"','\'','\'\'','\'b','a\0\0\0b','a\0','a""""b','a\'\'\'\'b','abc','abc\'def\\hij"klm\0opq','a\\\\\\\\b','b\'','c"','d\\','The\ZEnd','\\','\\d','\\\\') NOT NULL

drop table t1;

create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);

select * from t1 procedure analyse();

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

test.t1.df	1.1	2.2	8	8	0	0	1.650000000	0.302500000	ENUM('1.1','2.2') NOT NULL

drop table t1;

mysql-test/r/cast.result

+16 −0
Original line number Diff line number Diff line
@@ -187,3 +187,19 @@ timediff(cast('2004-12-30 12:00:00' as time), '12:00:00') 
select timediff(cast('1 12:00:00' as time), '12:00:00');

timediff(cast('1 12:00:00' as time), '12:00:00')

24:00:00

select cast('1.2' as decimal(3,2));

cast('1.2' as decimal(3,2))

1.20

select 1e18 * cast('1.2' as decimal(3,2));

1e18 * cast('1.2' as decimal(3,2))

1.2e+18

select cast(cast('1.2' as decimal(3,2)) as signed);

cast(cast('1.2' as decimal(3,2)) as signed)

1

set @v1=1e18;

select cast(@v1 as decimal(22, 2));

cast(@v1 as decimal(22, 2))

1000000000000000000.00

select cast(-1e18 as decimal(22,2));

cast(-1e18 as decimal(22,2))

-1000000000000000000.00

mysql-test/r/func_group.result

+35 −0
Original line number Diff line number Diff line
@@ -769,3 +769,38 @@ show columns from t2; 
Field	Type	Null	Key	Default	Extra

f2	datetime	NO		0000-00-00 00:00:00	

drop table t2, t1;

create table t2 (ff double);

insert into t2 values (2.2);

select cast(sum(distinct ff) as decimal(5,2)) from t2;

cast(sum(distinct ff) as decimal(5,2))

2.20

select cast(sum(distinct ff) as signed) from t2;

cast(sum(distinct ff) as signed)

2

select cast(variance(ff) as decimal(10,3)) from t2;

cast(variance(ff) as decimal(10,3))

0.000

select cast(min(ff) as decimal(5,2)) from t2;

cast(min(ff) as decimal(5,2))

2.20

create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);

select cast(sum(distinct df) as signed) from t1;

cast(sum(distinct df) as signed)

3

select cast(min(df) as signed) from t1;

cast(min(df) as signed)

0

select 1e8 * sum(distinct df) from t1;

1e8 * sum(distinct df)

330000000

select 1e8 * min(df) from t1;

1e8 * min(df)

110000000

create table t3 (ifl int);

insert into t3 values(1), (2);

select cast(min(ifl) as decimal(5,2)) from t3;

cast(min(ifl) as decimal(5,2))

1.00

drop table t1, t2, t3;

mysql-test/r/innodb.result

+2 −0
Original line number Diff line number Diff line
@@ -1798,3 +1798,5 @@ Variable_name Value 
innodb_thread_sleep_delay	10000

create table t1 (v varchar(16384)) engine=innodb;

ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead

create table t1 (a bit, key(a)) engine=innodb;

ERROR 42000: The storage engine for the table doesn't support BIT FIELD

mysql-test/r/myisam.result

+12 −0
Original line number Diff line number Diff line
@@ -1150,3 +1150,15 @@ drop table t1; 
set storage_engine=MyISAM;

create table t1 (v varchar(65535));

ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs

create table t1 (a int) engine=myisam;

drop table if exists t1;

Warnings:

Error	2	Can't find file: 't1' (errno: 2)

create table t1 (a int) engine=myisam;

drop table t1;

ERROR 42S02: Unknown table 't1'

create table t1 (a int) engine=myisam;

drop table t1;

ERROR HY000: File './test/t1.MYD' not found (Errcode: 2)

drop table t1;

ERROR 42S02: Unknown table 't1'