Commit 869b6557 authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/r/select.result:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents efe1ca20 41c09450

mysql-test/r/select.result

+22 −0
Original line number Diff line number Diff line
@@ -2401,3 +2401,25 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	

1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	

DROP TABLE t1, t2;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');

SELECT * FROM t1 WHERE city='London';

city

London

SELECT * FROM t1 WHERE city='london';

city

London

EXPLAIN SELECT * FROM t1 WHERE city='London' AND city='london';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT * FROM t1 WHERE city='London' AND city='london';

city

London

EXPLAIN SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

city

London

DROP TABLE t1;

sql/item.h

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ class Item_string :public Item 
  Item *new_item() 

  {

    return new Item_string(name, str_value.ptr(), 

    			   str_value.length(), &my_charset_bin);

    			   str_value.length(), collation.collation);

  }

  Item *safe_charset_converter(CHARSET_INFO *tocs);

  String *const_string() { return &str_value; }