Commit 259689f8 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-opt 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 3dd1ef7b efa8e330

mysql-test/r/query_cache.result

+6 −0
Original line number Diff line number Diff line
@@ -947,18 +947,24 @@ 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 DOUBLE value: '20050327 invalid'

Warning	1292	Truncated incorrect DOUBLE 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 DOUBLE value: '20050328 invalid'

Warning	1292	Truncated incorrect DOUBLE 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 DOUBLE value: '20050327 invalid'

Warning	1292	Truncated incorrect DOUBLE value: '20050327 invalid'

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

mysql-test/r/range.result

+45 −0
Original line number Diff line number Diff line
@@ -896,3 +896,48 @@ EXPLAIN SELECT * FROM t1 WHERE 0 NOT BETWEEN b AND c; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index_merge	idx1,idx2	idx1,idx2	4,4	NULL	4	Using sort_union(idx1,idx2); Using where

DROP TABLE t1;

CREATE TABLE t1 (                                      

item char(20) NOT NULL default '',                          

started datetime NOT NULL default '0000-00-00 00:00:00', 

price decimal(16,3) NOT NULL default '0.000',                 

PRIMARY KEY (item,started)                     

) ENGINE=MyISAM;

INSERT INTO t1 VALUES

('A1','2005-11-01 08:00:00',1000),

('A1','2005-11-15 00:00:00',2000),

('A1','2005-12-12 08:00:00',3000),

('A2','2005-12-01 08:00:00',1000);

EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	PRIMARY	PRIMARY	20	const	2	Using where

Warnings:

Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1

Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

item	started	price

A1	2005-11-01 08:00:00	1000.000

A1	2005-11-15 00:00:00	2000.000

Warnings:

Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1

Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';

item	started	price

A1	2005-11-01 08:00:00	1000.000

A1	2005-11-15 00:00:00	2000.000

DROP INDEX `PRIMARY` ON t1;

EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where

Warnings:

Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

item	started	price

A1	2005-11-01 08:00:00	1000.000

A1	2005-11-15 00:00:00	2000.000

Warnings:

Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';

item	started	price

A1	2005-11-01 08:00:00	1000.000

A1	2005-11-15 00:00:00	2000.000

DROP TABLE t1;

mysql-test/t/range.test

+29 −0
Original line number Diff line number Diff line
@@ -709,5 +709,34 @@ EXPLAIN SELECT * FROM t1 WHERE 0 NOT BETWEEN b AND c; 


DROP TABLE t1;



#

# Bug #16249: different results for a range with an without index 

#             when a range condition use an invalid datetime constant 

#



CREATE TABLE t1 (                                      

  item char(20) NOT NULL default '',                          

  started datetime NOT NULL default '0000-00-00 00:00:00', 

  price decimal(16,3) NOT NULL default '0.000',                 

  PRIMARY KEY (item,started)                     

) ENGINE=MyISAM;   



INSERT INTO t1 VALUES

('A1','2005-11-01 08:00:00',1000),

('A1','2005-11-15 00:00:00',2000),

('A1','2005-12-12 08:00:00',3000),

('A2','2005-12-01 08:00:00',1000);



EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';



DROP INDEX `PRIMARY` ON t1;



EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';

SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';



DROP TABLE t1;



# End of 5.0 tests

sql/item_sum.cc

+3 −1
Original line number Diff line number Diff line
@@ -290,7 +290,9 @@ Item_sum::Item_sum(THD *thd, Item_sum *item): 


void Item_sum::mark_as_sum_func()

{

  current_thd->lex->current_select->with_sum_func= 1;

  SELECT_LEX *cur_select= current_thd->lex->current_select;

  cur_select->n_sum_items++;

  cur_select->with_sum_func= 1;

  with_sum_func= 1;

}

sql/opt_range.cc

+8 −1
Original line number Diff line number Diff line
@@ -4129,6 +4129,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part, 
  MEM_ROOT *alloc= param->mem_root;

  char *str;

  ulong orig_sql_mode;

  int err;

  DBUG_ENTER("get_mm_leaf");



  /*
@@ -4280,7 +4281,13 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part, 
      (field->type() == FIELD_TYPE_DATE ||

       field->type() == FIELD_TYPE_DATETIME))

    field->table->in_use->variables.sql_mode|= MODE_INVALID_DATES;

  if (value->save_in_field_no_warnings(field, 1) < 0)

  err= value->save_in_field_no_warnings(field, 1);

  if (err > 0 && field->cmp_type() != value->result_type())

  {

    tree= 0;

    goto end;

  } 

  if (err < 0)

  {

    field->table->in_use->variables.sql_mode= orig_sql_mode;

    /* This happens when we try to insert a NULL field in a not null column */