Commit 72a64f08 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/B28366-5.0-opt-win
parents df306073 5d15377d

mysql-test/r/analyse.result

+12 −12
Original line number Diff line number Diff line
@@ -39,10 +39,10 @@ t2 CREATE TABLE `t2` ( 
  `Field_name` varbinary(255) NOT NULL default '',

  `Min_value` varbinary(255) default NULL,

  `Max_value` varbinary(255) default NULL,

  `Min_length` int(11) NOT NULL default '0',

  `Max_length` int(11) NOT NULL default '0',

  `Empties_or_zeros` int(11) NOT NULL default '0',

  `Nulls` int(11) NOT NULL default '0',

  `Min_length` bigint(11) NOT NULL default '0',

  `Max_length` bigint(11) NOT NULL default '0',

  `Empties_or_zeros` bigint(11) NOT NULL default '0',

  `Nulls` bigint(11) NOT NULL default '0',

  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL default ''
@@ -58,10 +58,10 @@ t2 CREATE TABLE `t2` ( 
  `Field_name` varbinary(255) NOT NULL default '',

  `Min_value` varbinary(255) default NULL,

  `Max_value` varbinary(255) default NULL,

  `Min_length` int(11) NOT NULL default '0',

  `Max_length` int(11) NOT NULL default '0',

  `Empties_or_zeros` int(11) NOT NULL default '0',

  `Nulls` int(11) NOT NULL default '0',

  `Min_length` bigint(11) NOT NULL default '0',

  `Max_length` bigint(11) NOT NULL default '0',

  `Empties_or_zeros` bigint(11) NOT NULL default '0',

  `Nulls` bigint(11) NOT NULL default '0',

  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL default ''
@@ -81,10 +81,10 @@ t2 CREATE TABLE `t2` ( 
  `Field_name` varbinary(255) NOT NULL default '',

  `Min_value` varbinary(255) default NULL,

  `Max_value` varbinary(255) default NULL,

  `Min_length` int(11) NOT NULL default '0',

  `Max_length` int(11) NOT NULL default '0',

  `Empties_or_zeros` int(11) NOT NULL default '0',

  `Nulls` int(11) NOT NULL default '0',

  `Min_length` bigint(11) NOT NULL default '0',

  `Max_length` bigint(11) NOT NULL default '0',

  `Empties_or_zeros` bigint(11) NOT NULL default '0',

  `Nulls` bigint(11) NOT NULL default '0',

  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL default ''

mysql-test/r/auto_increment.result

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ a b 
delete from t1 where a=0;

update t1 set a=NULL where b=6;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 4

Warning	1048	Column 'a' cannot be null

update t1 set a=300 where b=7;

SET SQL_MODE='';

insert into t1(a,b)values(NULL,8);
@@ -274,7 +274,7 @@ a b 
delete from t1 where a=0;

update t1 set a=NULL where b=13;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 9

Warning	1048	Column 'a' cannot be null

update t1 set a=500 where b=14;

select * from t1 order by b;

a	b

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Warnings: 
Note	1050	Table 't1' already exists

insert into t1 values (""),(null);

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2

Warning	1048	Column 'b' cannot be null

select * from t1;

b

mysql-test/r/func_date_add.result

+11 −0
Original line number Diff line number Diff line
@@ -84,4 +84,15 @@ CAST('2006-09-26' AS DATE) + INTERVAL 1 YEAR 
SELECT CAST('2006-09-26' AS DATE) + INTERVAL 1 WEEK;

CAST('2006-09-26' AS DATE) + INTERVAL 1 WEEK

2006-10-03

create table t1 (a int, b varchar(10));

insert into t1 values (1, '2001-01-01'),(2, '2002-02-02');

select '2007-01-01' + interval a day from t1;

'2007-01-01' + interval a day

2007-01-02

2007-01-03

select b + interval a day from t1;

b + interval a day

2001-01-02

2002-02-04

drop table t1;

End of 5.0 tests

mysql-test/r/insert.result

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ insert into t1 values(NULL); 
ERROR 23000: Column 'id' cannot be null

insert into t1 values (1), (NULL), (2);

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'id' at row 2

Warning	1048	Column 'id' cannot be null

select * from t1;

id

1