Commit 21fc5254 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 55485f5c 09795156

configure.in

+8 −5
Original line number Diff line number Diff line
@@ -683,15 +683,17 @@ int main() 
  AC_MSG_RESULT($atom_ops)



  AC_ARG_WITH(pstack,

    [  --without-pstack        Don't use the pstack backtrace library],

    [  --without-pstack        Do not use the pstack backtrace library],

    [USE_PSTACK=$withval],

    [USE_PSTACK=yes])

  pstack_libs= pstack_dirs=

  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i386"

  pstack_libs=

  pstack_dirs=

  pstack_makefile=

  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i686"

  then

    have_libiberty= have_libbfd=

    my_save_LIBS="$LIBS"

dnl I have no idea if this is a good test - can't find docs for libiberty  

dnl I have no idea if this is a good test - can not find docs for libiberty  

    AC_CHECK_LIB([iberty], [fdmatch],

      [have_libiberty=yes

       AC_CHECK_LIB([bfd], [bfd_openr], [have_libbfd=yes], , [-liberty])])
@@ -702,6 +704,7 @@ dnl I have no idea if this is a good test - can't find docs for libiberty 
    then

      pstack_dirs='$(top_srcdir)'/pstack

      pstack_libs="$pstack_dirs/libpstack.a -lbfd -liberty"

      pstack_makefile=pstack/Makefile

      AC_SUBST([pstack_dirs])

      AC_SUBST([pstack_libs])

      AC_DEFINE([USE_PSTACK])
@@ -2219,7 +2222,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \ 
 man/Makefile readline/Makefile vio/Makefile \

 libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \

 libmysql/Makefile client/Makefile \

 pstack/Makefile sql/Makefile sql/share/Makefile \

 $pstack_makefile sql/Makefile sql/share/Makefile \

 merge/Makefile dbug/Makefile scripts/Makefile \

 include/Makefile sql-bench/Makefile tools/Makefile \

 tests/Makefile Docs/Makefile support-files/Makefile \

libmysqld/Makefile.am

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \ 
## XXX: should we use client or server LDFLAGS for libmysqld?

LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmysqld.la

pkglib_LTLIBRARIES =	libmysqld.la



SUBDIRS =		examples

libmysqld_la_SOURCES=	libmysqld.c lib_sql.cc lib_load.cc



libmysqlsources =	errmsg.c get_password.c password.c

mysql-test/t/drop.test

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ drop database foo; 
# test drop/create database and FLUSH TABLES WITH READ LOCK

drop database if exists foo;

flush tables with read lock;

--error 1209,1218;

--error 1209,1219;

create database foo;

unlock tables;

create database foo;

show databases;

flush tables with read lock;

--error 1208,1218;

--error 1208,1219;

drop database foo;

unlock tables;

drop database foo;

mysql-test/t/isolation.test

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ create table t1 (f1 char(20) not null) type = gemini; 
insert into t1 (f1) values ("test2"), ("bar");

connection master1;

set transaction isolation level serializable;

!$-1217 select * from t1;

--error 1218

select * from t1;

connection master;

commit;

mysql-test/t/union.test

+7 −7
Original line number Diff line number Diff line
@@ -19,25 +19,25 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g 
# Test some error conditions with UNION

explain select a,b from t1 union all select a,b from t2;



--error 1216

--error 1217

select a,b from t1 into outfile 'skr' union select a,b from t2;



--error 1216

--error 1217

select a,b from t1 order by a union select a,b from t2;



--error 1216

--error 1217

insert into t3 select a from t1 order by a union select a from t2;



--error 1217

--error 1218

create table t3 select a,b from t1 union select a from t2;



--error 1217

--error 1218

select a,b from t1 union select a from t2;



--error 1217

--error 1218

select * from t1 union select a from t2;



--error 1217

--error 1218

select a from t1 union select * from t2;



# Test CREATE, INSERT and REPLACE