Commit d5685d4c authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files

Merge bk@192.168.21.1:mysql-5.0-opt 

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
parents 093b0deb c7a45473

mysql-test/r/sp_trans.result

+1 −2
Original line number Diff line number Diff line
@@ -530,8 +530,6 @@ count(*) 
drop table t3, t4|

drop procedure bug14210|

set @@session.max_heap_table_size=default|

drop function if exists bug23333|

drop table if exists t1,t2|

CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|

CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|

insert into t2 values (1,1)|
@@ -551,3 +549,4 @@ Log_name Pos Event_type Server_id End_log_pos Info 
select count(*),@a from t1 /* must be 1,1 */|

count(*)	@a

1	1

drop table t1, t2|

mysql-test/r/strict.result

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ set @@sql_mode='ansi,traditional'; 
select @@sql_mode;

@@sql_mode

REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2;

CREATE TABLE t1 (col1 date);

INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29');

INSERT INTO t1 VALUES('0000-10-31');

mysql-test/t/sp_trans.test

+3 −6
Original line number Diff line number Diff line
@@ -559,10 +559,6 @@ set @@session.max_heap_table_size=default| 
#            breaks stmt-based binlog

# Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()

#

--disable_warnings

drop function if exists bug23333|

drop table if exists t1,t2|

--enable_warnings

CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|

CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
@@ -583,6 +579,7 @@ insert into t2 values (bug23333(),1)| 
--replace_column 2 # 5 # 6 #

show binlog events from 98 /* with fixes for #23333 will show there is the query */|

select count(*),@a from t1 /* must be 1,1 */|

drop table t1, t2|



#

# BUG#NNNN: New bug synopsis

mysql-test/t/strict.test

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ set @@sql_mode='ansi,traditional'; 
select @@sql_mode;



--disable_warnings

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2;

--enable_warnings



# Test INSERT with DATE