bk commit into 5.0 tree (msvensson:1.1813)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1813 05/03/14 12:25:26 msvensson@neptunus.(none) +6 -0
  Manual merge

  sql/ha_ndbcluster.cc
    1.162 05/03/14 12:25:22 msvensson@neptunus.(none) +0 -6
    Merged conflicts

  sql/item_cmpfunc.h
    1.96 05/03/14 12:23:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.140 05/03/14 12:23:14 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.24 05/03/14 12:23:14 msvensson@neptunus.(none) +1 -1
    Auto merged

  mysql-test/r/join_outer.result
    1.35 05/03/14 12:23:14 msvensson@neptunus.(none) +6 -6
    Auto merged

  BitKeeper/etc/logging_ok
    1.299 05/03/14 12:23:09 msvensson@neptunus.(none) +0 -1
    auto-union

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.139/sql/ha_berkeley.cc	2005-02-19 12:15:21 +01:00
+++ 1.140/sql/ha_berkeley.cc	2005-03-14 12:23:14 +01:00
@@ -371,8 +371,9 @@
 ** 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

--- 1.95/sql/item_cmpfunc.h	2005-03-13 09:30:48 +01:00
+++ 1.96/sql/item_cmpfunc.h	2005-03-14 12:23:15 +01:00
@@ -1187,6 +1187,8 @@
   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 @@
   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() {}
 };
 
 

--- 1.161/sql/ha_ndbcluster.cc	2005-03-10 09:20:39 +01:00
+++ 1.162/sql/ha_ndbcluster.cc	2005-03-14 12:25:22 +01:00
@@ -3015,12 +3015,8 @@
 }
 
 
-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; }
 
 
 /*

--- 1.34/mysql-test/r/join_outer.result	2005-03-13 09:40:51 +01:00
+++ 1.35/mysql-test/r/join_outer.result	2005-03-14 12:23:14 +01:00
@@ -910,4 +910,10 @@
 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.23/mysql-test/t/join_outer.test	2005-03-13 10:05:53 +01:00
+++ 1.24/mysql-test/t/join_outer.test	2005-03-14 12:23:14 +01:00
@@ -645,6 +645,7 @@
 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;