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

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
mysql-test/r/func_op.result:
  Auto merged
sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-13 15:07:50 +03:00
parent 93409ee7be c2ee905473
commit 1cc27df05d
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -805,6 +805,9 @@ AC_SUBST(WRAPLIBS)
if test "$TARGET_LINUX" = "true"; then if test "$TARGET_LINUX" = "true"; then
AC_MSG_CHECKING([for atomic operations]) AC_MSG_CHECKING([for atomic operations])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
atom_ops= atom_ops=
AC_TRY_RUN([ AC_TRY_RUN([
#include <asm/atomic.h> #include <asm/atomic.h>
@ -840,6 +843,8 @@ int main()
if test -z "$atom_ops"; then atom_ops="no"; fi if test -z "$atom_ops"; then atom_ops="no"; fi
AC_MSG_RESULT($atom_ops) AC_MSG_RESULT($atom_ops)
AC_LANG_RESTORE
AC_ARG_WITH(pstack, AC_ARG_WITH(pstack,
[ --with-pstack Use the pstack backtrace library], [ --with-pstack Use the pstack backtrace library],
[ USE_PSTACK=$withval ], [ USE_PSTACK=$withval ],

11
mysql-test/r/func_op.result
View File

@ -35,3 +35,14 @@ select -1 >> 0, -1 << 0;
select -1 >> 1, -1 << 1; select -1 >> 1, -1 << 1;
-1 >> 1 -1 << 1 -1 >> 1 -1 << 1
9223372036854775807 18446744073709551614 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;

14
mysql-test/t/func_op.test
View File

@ -17,4 +17,18 @@ select 0 | -1, 0 ^ -1, 0 & -1;
select -1 >> 0, -1 << 0; select -1 >> 0, -1 << 0;
select -1 >> 1, -1 << 1; select -1 >> 1, -1 << 1;
#
# Bug 13044: wrong bit_count() results
#
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
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;
drop table t1, t2;
# End of 4.1 tests # End of 4.1 tests

5
sql/item_func.cc
View File

@ -2462,11 +2462,8 @@ longlong Item_func_bit_count::val_int()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
ulonglong value= (ulonglong) args[0]->val_int(); ulonglong value= (ulonglong) args[0]->val_int();
if (args[0]->null_value) if ((null_value= args[0]->null_value))
{
null_value=1; /* purecov: inspected */
return 0; /* purecov: inspected */ return 0; /* purecov: inspected */
}
return (longlong) my_count_bits(value); return (longlong) my_count_bits(value);
} }