Commit 976e0ca1 authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

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

into  magare.gmz:/home/kgeorge/mysql/autopush/B31221-5.0-opt
parents 7f67efcc d67cd9e8

mysql-test/r/derived.result

+2 −1
Original line number Diff line number Diff line
@@ -326,7 +326,8 @@ id select_type table type possible_keys key key_len ref rows Extra 
2	DERIVED	t2	index	PRIMARY	PRIMARY	4	NULL	2	Using where; Using index

drop table t2;

CREATE TABLE `t1` ( `itemid` int(11) NOT NULL default '0', `grpid` varchar(15) NOT NULL default '', `vendor` int(11) NOT NULL default '0', `date_` date NOT NULL default '0000-00-00', `price` decimal(12,2) NOT NULL default '0.00', PRIMARY KEY  (`itemid`,`grpid`,`vendor`,`date_`), KEY `itemid` (`itemid`,`vendor`), KEY `itemid_2` (`itemid`,`date_`));

insert into t1 values (128, 'rozn', 2, now(), 10),(128, 'rozn', 1, now(), 10);

insert into t1 values (128, 'rozn', 2, curdate(), 10),

(128, 'rozn', 1, curdate(), 10);

SELECT MIN(price) min, MAX(price) max, AVG(price) avg FROM (SELECT SUBSTRING( MAX(concat(date_,";",price)), 12) price FROM t1 WHERE itemid=128 AND  grpid='rozn' GROUP BY itemid, grpid, vendor) lastprices;

min	max	avg

10.00	10.00	10

mysql-test/r/ps_2myisam.result

+2 −1
Original line number Diff line number Diff line
@@ -2973,11 +2973,13 @@ Warnings: 
Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1
@@ -3011,7 +3013,6 @@ Warning 1265 Data truncated for column 'c15' at row 1 
Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

mysql-test/r/ps_3innodb.result

+2 −1
Original line number Diff line number Diff line
@@ -2956,11 +2956,13 @@ Warnings: 
Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1
@@ -2994,7 +2996,6 @@ Warning 1265 Data truncated for column 'c15' at row 1 
Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

mysql-test/r/ps_4heap.result

+2 −1
Original line number Diff line number Diff line
@@ -2957,11 +2957,13 @@ Warnings: 
Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1
@@ -2995,7 +2997,6 @@ Warning 1265 Data truncated for column 'c15' at row 1 
Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

mysql-test/r/ps_5merge.result

+4 −2
Original line number Diff line number Diff line
@@ -2893,11 +2893,13 @@ Warnings: 
Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1
@@ -2931,7 +2933,6 @@ Warning 1265 Data truncated for column 'c15' at row 1 
Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1
@@ -5914,11 +5915,13 @@ Warnings: 
Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1
@@ -5952,7 +5955,6 @@ Warning 1265 Data truncated for column 'c15' at row 1 
Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1