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

Manual merge

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2005-03-14 12:25:26 +01:00
parent c30095c920 13ec961c3a
commit a7ad7784c3
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -910,4 +910,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;

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

@@ -645,6 +645,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;

3
sql/ha_berkeley.cc
View File

@@ -371,8 +371,9 @@ void berkeley_cleanup_log_files(void)
** Berkeley DB tables
*****************************************************************************/
static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS };
const char **ha_berkeley::bas_ext() const
{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; }
{ return ha_bdb_bas_exts; }
ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const

8
sql/ha_ndbcluster.cc
View File

@@ -3015,12 +3015,8 @@ int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size)
}
static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS };
const char**
ha_ndbcluster::bas_ext() const
{
return ha_ndb_bas_ext;
}
static const char *ha_ndb_bas_exts[]= { ha_ndb_ext, NullS };
{ return ha_ndb_bas_exts; }
/*

4
sql/item_cmpfunc.h
View File

@@ -1187,6 +1187,8 @@ public:
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;
@@ -1234,7 +1236,7 @@ public:
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() {}
};