Commit 1f0c2ab3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/deleted/.del-not_windows.inc:
  Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/query_cache.result:
  Resolve conflict
parents 2b414714 1beb95e3

mysql-test/include/not_windows.inc

+2 −2
Original line number Diff line number Diff line 
--require r/true.require

--disable_query_log;

disable_query_log;

select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE";

--enable_query_log;
 
enable_query_log;

mysql-test/r/query_cache.result

+9 −9
Original line number Diff line number Diff line
@@ -941,24 +941,24 @@ KEY `date` (`date`) 
) ENGINE=MyISAM;

INSERT INTO t1 VALUES ('20050326');

INSERT INTO t1 VALUES ('20050325');

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

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

COUNT(*)

0

Warnings:

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

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

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

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

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

COUNT(*)

0

Warnings:

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

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

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

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

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

COUNT(*)

0

Warnings:

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

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

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

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

mysql-test/r/type_datetime.result

+10 −0
Original line number Diff line number Diff line
@@ -153,3 +153,13 @@ dt 
0000-00-00 00:00:00

0000-00-00 00:00:00

drop table t1;

create table t1 (dt datetime);

insert into t1 values ("20010101T010101");

insert into t1 values ("2001-01-01T01:01:01");

insert into t1 values ("2001-1-1T1:01:01");

select * from t1;

dt

2001-01-01 01:01:01

2001-01-01 01:01:01

2001-01-01 01:01:01

drop table t1;

mysql-test/t/packet.test

+3 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support external clients

--source include/not_embedded.inc

# Windows fails because it disconnects on too-large packets instead of just

# swallowing them and returning an error

--source include/not_windows.inc



#

# Check protocol handling

mysql-test/t/query_cache.test

+3 −3
Original line number Diff line number Diff line
@@ -709,9 +709,9 @@ CREATE TABLE t1 ( 


INSERT INTO t1 VALUES ('20050326');

INSERT INTO t1 VALUES ('20050325');

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

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

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

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

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

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

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";