Commit df93b4fa authored by unknown's avatar unknown
Browse files

merged 


sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  !bk-eb merged
mysql-test/t/join_outer.test:
  !bk-eb merged
parents 72ae2a58 2427f369

mysql-test/r/join_outer.result

+6 −0
Original line number Diff line number Diff line
@@ -917,4 +917,10 @@ a b a b 
1	1	1	2

2	1	2	2

3	1	NULL	NULL

SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE not(0+(t1.a=30 and t2.b=1));

a	b	a	b

1	1	1	2

2	1	2	2

3	1	NULL	NULL

4	2	NULL	NULL

DROP TABLE t1,t2;

mysql-test/t/join_outer.test

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a; 
SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE t1.b=1;

SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a

  WHERE t1.b=1 XOR (NOT ISNULL(t2.a) AND t2.b=1);

SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE not(0+(t1.a=30 and t2.b=1));



DROP TABLE t1,t2;

sql/item_cmpfunc.h

+3 −1
Original line number Diff line number Diff line
@@ -1190,6 +1190,8 @@ class Item_cond_and :public Item_cond 
  enum Functype functype() const { return COND_AND_FUNC; }

  longlong val_int();

  const char *func_name() const { return "and"; }

  table_map not_null_tables() const

  { return abort_on_null ? not_null_tables_cache: and_tables_cache; }

  Item* copy_andor_structure(THD *thd)

  {

    Item_cond_and *item;
@@ -1237,7 +1239,7 @@ class Item_cond_xor :public Item_cond 
  enum Type type() const { return FUNC_ITEM; }

  longlong val_int();

  const char *func_name() const { return "xor"; }

  table_map not_null_tables() const { return and_tables_cache; }

  void top_level_item() {}

};