bk commit into 5.0 tree (msvensson:1.1851)

[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.1851 05/04/01 11:15:11 msvensson@neptunus.(none) +7 -0
  Merge

  sql/ha_ndbcluster.cc
    1.168 05/04/01 11:15:09 msvensson@neptunus.(none) +0 -0
    SCCS merged

  sql/item_cmpfunc.h
    1.97 05/04/01 11:10:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.143 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.25 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -1
    Auto merged

  mysql-test/r/join_outer.result
    1.36 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -6
    Auto merged

  configure.in
    1.278 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.300 05/04/01 11:10:25 msvensson@neptunus.(none) +0 -0
    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/bug6554/RESYNC

--- 1.277/configure.in	2005-03-29 21:06:19 +02:00
+++ 1.278/configure.in	2005-04-01 11:10:44 +02:00
@@ -353,7 +353,8 @@
   then
     if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
     then
-      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"
+     # Statically link the language support function's found in libsupc++.a
+     LIBS="$LIBS -lsupc++"
     fi
   fi
 fi

--- 1.142/sql/ha_berkeley.cc	2005-03-19 01:12:21 +01:00
+++ 1.143/sql/ha_berkeley.cc	2005-04-01 11:10:44 +02:00
@@ -372,9 +372,8 @@
 ** Berkeley DB tables
 *****************************************************************************/
 
-static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS };
 const char **ha_berkeley::bas_ext() const
-{ return ha_bdb_bas_exts; }
+{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; }
 
 
 ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const

--- 1.96/sql/item_cmpfunc.h	2005-03-14 12:23:15 +01:00
+++ 1.97/sql/item_cmpfunc.h	2005-04-01 11:10:45 +02:00
@@ -905,8 +905,9 @@
 
 class Item_func_isnotnull :public Item_bool_func
 {
+  bool abort_on_null;
 public:
-  Item_func_isnotnull(Item *a) :Item_bool_func(a) {}
+  Item_func_isnotnull(Item *a) :Item_bool_func(a), abort_on_null(0) {}
   longlong val_int();
   enum Functype functype() const { return ISNOTNULL_FUNC; }
   void fix_length_and_dec()
@@ -915,10 +916,12 @@
   }
   const char *func_name() const { return "isnotnull"; }
   optimize_type select_optimize() const { return OPTIMIZE_NULL; }
-  table_map not_null_tables() const { return used_tables(); }
+  table_map not_null_tables() const
+  { return abort_on_null ? not_null_tables_cache : 0; }
   Item *neg_transformer(THD *thd);
   void print(String *str);
   CHARSET_INFO *compare_collation() { return args[0]->collation.collation; }
+  void top_level_item() { abort_on_null=1; }
 };
 
 
@@ -1004,7 +1007,7 @@
   /* Item_cond() is only used to create top level items */
   Item_cond(): Item_bool_func(), abort_on_null(1)
   { const_item_cache=0; }
-  Item_cond(Item *i1,Item *i2) 
+  Item_cond(Item *i1,Item *i2)
     :Item_bool_func(), abort_on_null(0)
   {
     list.push_back(i1);

--- 1.299/BitKeeper/etc/logging_ok	2005-03-14 12:23:09 +01:00
+++ 1.300/BitKeeper/etc/logging_ok	2005-04-01 11:10:25 +02:00
@@ -25,6 +25,7 @@
 bar@stripped
 bar@stripped
 bar@deer.(none)
+bar@stripped
 bar@stripped
 bar@stripped
 bar@stripped
@@ -48,7 +49,9 @@
 dlenev@stripped
 dlenev@stripped
 ejonore@stripped
+gbichot@stripped
 gbichot@stripped
+gbichot@stripped
 georg@stripped
 georg@stripped
 georg@stripped
@@ -117,6 +120,7 @@
 lars@stripped
 lenz@stripped
 lenz@stripped
+magnus@stripped
 magnus@neptunus.(none)
 magnus@shellback.(none)
 marko@stripped
@@ -182,6 +186,7 @@
 nick@stripped
 nick@stripped
 papa@stripped
+patg@krsna.
 patg@stripped
 patg@stripped
 patg@stripped
@@ -224,6 +229,7 @@
 sasha@stripped
 serg@stripped
 serg@stripped
+serg@stripped
 serg@stripped
 serg@stripped
 serg@stripped

--- 1.167/sql/ha_ndbcluster.cc	2005-03-31 14:32:40 +02:00
+++ 1.168/sql/ha_ndbcluster.cc	2005-04-01 11:15:09 +02:00
@@ -3022,12 +3022,8 @@
 }
 
 
-static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS };
-const char**
-ha_ndbcluster::bas_ext() const
-{   
-  return ha_ndb_bas_ext; 
-}
+const char** ha_ndbcluster::bas_ext() const
+{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; }
 
 
 /*

--- 1.35/mysql-test/r/join_outer.result	2005-03-14 12:23:14 +01:00
+++ 1.36/mysql-test/r/join_outer.result	2005-04-01 11:10:44 +02:00
@@ -650,6 +650,13 @@
 i	i	i
 1	NULL	NULL
 2	2	2
+select * from t1 natural left join t2 where (t2.i is not null)=0;
+i	i
+1	NULL
+select * from t1 natural left join t2 where (t2.i is not null) is not null;
+i	i
+1	NULL
+2	2
 drop table t1,t2,t3;
 create table t1 (f1 integer,f2 integer,f3 integer);
 create table t2 (f2 integer,f4 integer);

--- 1.24/mysql-test/t/join_outer.test	2005-03-14 12:23:14 +01:00
+++ 1.25/mysql-test/t/join_outer.test	2005-04-01 11:10:44 +02:00
@@ -430,6 +430,8 @@
 insert into t2 values(2),(3);
 insert into t3 values(2),(4);
 select * from t1 natural left join t2 natural left join t3;
+select * from t1 natural left join t2 where (t2.i is not null)=0;
+select * from t1 natural left join t2 where (t2.i is not null) is not null;
 drop table t1,t2,t3;
 
 #