Commit 4cfc649d authored by unknown's avatar unknown
Browse files

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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1


configure.in:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/share/errmsg.txt:
  merge
parents c7a5f503 8dc06e0f

config/ac-macros/misc.m4

+4 −1
Original line number Diff line number Diff line
@@ -361,7 +361,8 @@ AC_CACHE_VAL(mysql_cv_termcap_lib, 
[AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,

    [AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,

	[AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,

	    mysql_cv_termcap_lib=NOT_FOUND)])])])

          [AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,

	    mysql_cv_termcap_lib=NOT_FOUND)])])])])

AC_MSG_CHECKING(for termcap functions library)

if test "$mysql_cv_termcap_lib" = "NOT_FOUND"; then

AC_MSG_ERROR([No curses/termcap library found])
@@ -369,6 +370,8 @@ elif test "$mysql_cv_termcap_lib" = "libtermcap"; then 
TERMCAP_LIB=-ltermcap

elif test "$mysql_cv_termcap_lib" = "libncurses"; then

TERMCAP_LIB=-lncurses

elif test "$mysql_cv_termcap_lib" = "libtinfo"; then

TERMCAP_LIB=-ltinfo

else

TERMCAP_LIB=-lcurses

fi

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -775,6 +775,9 @@ AC_SUBST(WRAPLIBS) 
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>
@@ -810,6 +813,8 @@ int main() 
  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],

    [ USE_PSTACK=$withval ],

mysql-test/r/func_op.result

+11 −0
Original line number Diff line number Diff line
@@ -35,3 +35,14 @@ select -1 >> 0, -1 << 0; 
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;

mysql-test/r/view.result

+23 −0
Original line number Diff line number Diff line
@@ -2600,3 +2600,26 @@ id td 
5	2005-01-04

DROP VIEW v1;

DROP TABLE t1;

create table t1 (a int);

create view v1 as select * from t1;

create view v2 as select * from v1;

drop table t1;

rename table v2 to t1;

select * from v1;

ERROR HY000: `test`.`v1` contain view recursion

drop view t1, v1;

create table t1 (a int);

create function f1() returns int

begin

declare mx int;

select max(a) from t1 into mx;

return mx;

end//

create view v1 as select f1() as a;

create view v2 as select * from v1;

drop table t1;

rename table v2 to t1;

select * from v1;

ERROR HY000: Recursive stored functions and triggers are not allowed.

drop function f1;

drop view t1, v1;

mysql-test/t/func_op.test

+14 −0
Original line number Diff line number Diff line
@@ -17,4 +17,18 @@ select 0 | -1, 0 ^ -1, 0 & -1; 
select -1 >> 0, -1 << 0;

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