database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge olga.mysql.com:/home/igor/mysql-5.0-opt

Browse Source 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26017
This commit is contained in:
unknown
2007-02-09 12:58:35 -08:00
parent dd6feec4f4 7ab33d5070
commit ce8c0ec29b
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/join_outer.result
View File

@@ -1194,3 +1194,23 @@ a b
3 3 3 3
4 NULL 4 NULL
DROP TABLE t1,t2; DROP TABLE t1,t2;
CREATE TABLE t1 (
f1 varchar(16) collate latin1_swedish_ci PRIMARY KEY,
f2 varchar(16) collate latin1_swedish_ci
);
CREATE TABLE t2 (
f1 varchar(16) collate latin1_swedish_ci PRIMARY KEY,
f3 varchar(16) collate latin1_swedish_ci
);
INSERT INTO t1 VALUES ('bla','blah');
INSERT INTO t2 VALUES ('bla','sheep');
SELECT * FROM t1 JOIN t2 USING(f1) WHERE f1='Bla';
f1 f2 f3
bla blah sheep
SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='bla';
f1 f2 f3
bla blah sheep
SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='Bla';
f1 f2 f3
bla blah sheep
DROP TABLE t1,t2;

23
mysql-test/t/join_outer.test
View File

@@ -802,3 +802,26 @@ SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.b WHERE (1=1 OR 2=2);
SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.b WHERE (1=1 OR 1=0); SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.b WHERE (1=1 OR 1=0);
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug 26017: LEFT OUTER JOIN over two constant tables and
# a case-insensitive comparison predicate field=const
#
CREATE TABLE t1 (
f1 varchar(16) collate latin1_swedish_ci PRIMARY KEY,
f2 varchar(16) collate latin1_swedish_ci
);
CREATE TABLE t2 (
f1 varchar(16) collate latin1_swedish_ci PRIMARY KEY,
f3 varchar(16) collate latin1_swedish_ci
);
INSERT INTO t1 VALUES ('bla','blah');
INSERT INTO t2 VALUES ('bla','sheep');
SELECT * FROM t1 JOIN t2 USING(f1) WHERE f1='Bla';
SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='bla';
SELECT * FROM t1 LEFT JOIN t2 USING(f1) WHERE f1='Bla';
DROP TABLE t1,t2;

4
sql/item_cmpfunc.cc
View File

@@ -4034,11 +4034,9 @@ longlong Item_equal::val_int()
void Item_equal::fix_length_and_dec() void Item_equal::fix_length_and_dec()
{ {
Item *item= const_item ? const_item : get_first(); Item *item= get_first();
eval_item= cmp_item::get_comparator(item->result_type(), eval_item= cmp_item::get_comparator(item->result_type(),
item->collation.collation); item->collation.collation);
if (item->result_type() == STRING_RESULT)
eval_item->cmp_charset= cmp_collation.collation;
} }
bool Item_equal::walk(Item_processor processor, byte *arg) bool Item_equal::walk(Item_processor processor, byte *arg)

1
sql/item_cmpfunc.h
View File

@@ -1296,7 +1296,6 @@ class Item_equal: public Item_bool_func
Item *const_item; /* optional constant item equal to fields items */ Item *const_item; /* optional constant item equal to fields items */
cmp_item *eval_item; cmp_item *eval_item;
bool cond_false; bool cond_false;
DTCollation cmp_collation;
public: public:
inline Item_equal() inline Item_equal()
: Item_bool_func(), const_item(0), eval_item(0), cond_false(0) : Item_bool_func(), const_item(0), eval_item(0), cond_false(0)