bk commit into 5.0 tree (bell:1.2152)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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.2152 06/04/13 12:18:19 bell@stripped +4 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

  sql/item_func.cc
    1.277 06/04/13 12:18:14 bell@stripped +0 -0
    Auto merged

  mysql-test/r/func_op.result
    1.11 06/04/13 12:18:14 bell@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.141 06/04/13 12:18:14 bell@stripped +0 -0
    Auto merged

  configure.in
    1.381 06/04/13 12:18:13 bell@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.18.2 06/04/13 12:18:13 bell@stripped +0 -0
    Merge rename: acinclude.m4 -> BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-5.0/RESYNC

--- 1.123.18.1/acinclude.m4	2006-04-11 14:49:29 +03:00
+++ 1.141/BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003	2006-04-13 12:18:14 +03:00
@@ -1182,23 +1182,6 @@
 AC_SUBST(orbit_idl)
 ])
 
-AC_DEFUN([MYSQL_CHECK_ISAM], [
-  AC_ARG_WITH([isam], [
-  --with-isam             Enable the ISAM table type],
-    [with_isam="$withval"],
-    [with_isam=no])
-
-  isam_libs=
-  if test X"$with_isam" = X"yes"
-  then
-    AC_DEFINE([HAVE_ISAM], [1], [Using old ISAM tables])
-    isam_libs="\$(top_builddir)/isam/libnisam.a\
- \$(top_builddir)/merge/libmerge.a"
-  fi
-  AC_SUBST(isam_libs)
-])
-
-
 dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CHECK_BDB
 dnl Sets HAVE_BERKELEY_DB if inst library is found

--- 1.380/configure.in	2006-03-29 21:25:40 +03:00
+++ 1.381/configure.in	2006-04-13 12:18:13 +03:00
@@ -805,6 +805,9 @@
 if test "$TARGET_LINUX" = "true"; then
   AC_MSG_CHECKING([for atomic operations])
 
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+
   atom_ops=
   AC_TRY_RUN([
 #include <asm/atomic.h>
@@ -839,6 +842,8 @@
 
   if test -z "$atom_ops"; then atom_ops="no"; fi
   AC_MSG_RESULT($atom_ops)
+
+  AC_LANG_RESTORE
 
   AC_ARG_WITH(pstack,
     [  --with-pstack           Use the pstack backtrace library],

--- 1.276/sql/item_func.cc	2006-03-23 22:44:54 +02:00
+++ 1.277/sql/item_func.cc	2006-04-13 12:18:14 +03:00
@@ -2462,11 +2462,8 @@
 {
   DBUG_ASSERT(fixed == 1);
   ulonglong value= (ulonglong) args[0]->val_int();
-  if (args[0]->null_value)
-  {
-    null_value=1; /* purecov: inspected */
+  if ((null_value= args[0]->null_value))
     return 0; /* purecov: inspected */
-  }
   return (longlong) my_count_bits(value);
 }
 

--- 1.10/mysql-test/r/func_op.result	2005-05-05 23:01:34 +03:00
+++ 1.11/mysql-test/r/func_op.result	2006-04-13 12:18:14 +03:00
@@ -35,3 +35,14 @@
 select -1 >> 1, -1 << 1;
 -1 >> 1	-1 << 1
 9223372036854775807	18446744073709551614
+drop table if exists t1,t2;
+create table t1(a int);
+create table t2(a int, b int);
+insert into t1 values (1), (2), (3);
+insert into t2 values (1, 7), (3, 7);
+select t1.a, t2.a, t2.b, bit_count(t2.b) from t1 left join t2 on t1.a=t2.a;
+a	a	b	bit_count(t2.b)
+1	1	7	3
+2	NULL	NULL	NULL
+3	3	7	3
+drop table t1, t2;