database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merged

Browse Source 
sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  !bk-eb merged
mysql-test/t/join_outer.test:
  !bk-eb merged
This commit is contained in:
unknown
2005-03-14 18:46:30 +01:00
parent 72ae2a5884 2427f3695c
commit df93b4fa35
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -917,4 +917,10 @@ a b a b
1 1 1 2 1 1 1 2
2 1 2 2 2 1 2 2
3 1 NULL NULL 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; DROP TABLE t1,t2;

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

@ -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;
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 XOR (NOT ISNULL(t2.a) AND t2.b=1); 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; DROP TABLE t1,t2;

4
sql/item_cmpfunc.h
View File

@ -1190,6 +1190,8 @@ public:
enum Functype functype() const { return COND_AND_FUNC; } enum Functype functype() const { return COND_AND_FUNC; }
longlong val_int(); longlong val_int();
const char *func_name() const { return "and"; } 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* copy_andor_structure(THD *thd)
{ {
Item_cond_and *item; Item_cond_and *item;
@ -1237,7 +1239,7 @@ public:
enum Type type() const { return FUNC_ITEM; } enum Type type() const { return FUNC_ITEM; }
longlong val_int(); longlong val_int();
const char *func_name() const { return "xor"; } const char *func_name() const { return "xor"; }
table_map not_null_tables() const { return and_tables_cache; } void top_level_item() {}
}; };