Commit a6975c01 authored by unknown's avatar unknown
Browse files

fix after merge 


mysql-test/r/bigint.result:
  fix test after merge
mysql-test/r/query_cache.result:
  fix test after merge
mysql-test/r/type_datetime.result:
  fix test after merge
parent de00ff76

mysql-test/r/bigint.result

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ select 1,11,101,1001,10001,100001,1000001,10000001,100000001,1000000001,10000000 
1	11	101	1001	10001	100001	1000001	10000001	100000001	1000000001	10000000001	100000000001	1000000000001	10000000000001	100000000000001	1000000000000001	10000000000000001	100000000000000001	1000000000000000001	10000000000000000001

select -1,-11,-101,-1001,-10001,-100001,-1000001,-10000001,-100000001,-1000000001,-10000000001,-100000000001,-1000000000001,-10000000000001,-100000000000001,-1000000000000001,-10000000000000001,-100000000000000001,-1000000000000000001,-10000000000000000001;

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000001

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000000

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000001

select conv(1,10,16),conv((1<<2)-1,10,16),conv((1<<10)-2,10,16),conv((1<<16)-3,10,16),conv((1<<25)-4,10,16),conv((1<<31)-5,10,16),conv((1<<36)-6,10,16),conv((1<<47)-7,10,16),conv((1<<48)-8,10,16),conv((1<<55)-9,10,16),conv((1<<56)-10,10,16),conv((1<<63)-11,10,16);

conv(1,10,16)	conv((1<<2)-1,10,16)	conv((1<<10)-2,10,16)	conv((1<<16)-3,10,16)	conv((1<<25)-4,10,16)	conv((1<<31)-5,10,16)	conv((1<<36)-6,10,16)	conv((1<<47)-7,10,16)	conv((1<<48)-8,10,16)	conv((1<<55)-9,10,16)	conv((1<<56)-10,10,16)	conv((1<<63)-11,10,16)

1	3	3FE	FFFD	1FFFFFC	7FFFFFFB	FFFFFFFFA	7FFFFFFFFFF9	FFFFFFFFFFF8	7FFFFFFFFFFFF7	FFFFFFFFFFFFF6	7FFFFFFFFFFFFFF5

mysql-test/r/query_cache.result

+0 −6
Original line number Diff line number Diff line
@@ -947,24 +947,18 @@ COUNT(*) 
Warnings:

Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 1

Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 1

Warning	1292	Truncated incorrect INTEGER value: '20050327 invalid'

Warning	1292	Truncated incorrect INTEGER value: '20050327 invalid'

SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid';

COUNT(*)

0

Warnings:

Warning	1292	Incorrect datetime value: '20050328 invalid' for column 'date' at row 1

Warning	1292	Incorrect datetime value: '20050328 invalid' for column 'date' at row 1

Warning	1292	Truncated incorrect INTEGER value: '20050328 invalid'

Warning	1292	Truncated incorrect INTEGER value: '20050328 invalid'

SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';

COUNT(*)

0

Warnings:

Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 1

Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 1

Warning	1292	Truncated incorrect INTEGER value: '20050327 invalid'

Warning	1292	Truncated incorrect INTEGER value: '20050327 invalid'

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

mysql-test/r/type_datetime.result

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ t 
truncate table t1;

insert into t1 values("2003-0303 12:13:14");

Warnings:

Warning	1264	Data truncated; out of range for column 't' at row 1

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

select * from t1;

t

0000-00-00 00:00:00

sql/sql_union.cc

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, 
      }

    }

    

    ulong create_options= (first_select_in_union()->options | thd_arg->options |

    create_options= (first_select_in_union()->options | thd_arg->options |

                     TMP_TABLE_ALL_COLUMNS) & ~TMP_TABLE_FORCE_MYISAM;

    /*

      Force the temporary table to be a MyISAM table if we're going to use