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

5 files changed, 25 insertions, 21 deletions

diff --git a/configure.in b/configure.in
index 73e38e01fde..a0b6b0bbacb 100644
--- a/configure.in
+++ b/configure.in
@@ -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 \
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index aaa2b469ccb..feeec6225fd 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -30,14 +30,14 @@ 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
+LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmysqld.la
+pkglib_LTLIBRARIES =	libmysqld.la
+SUBDIRS =		examples
+libmysqld_la_SOURCES=	libmysqld.c lib_sql.cc lib_load.cc
 
-libmysqld_la_SOURCES = libmysqld.c lib_sql.cc lib_load.cc
-
-libmysqlsources = errmsg.c get_password.c password.c
+libmysqlsources =	errmsg.c get_password.c password.c
 ## XXX: we should not have to duplicate info from the sources list
-libmysqlobjects = errmsg.lo get_password.lo password.lo
+libmysqlobjects =	errmsg.lo get_password.lo password.lo
 
 sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
 	ha_innobase.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index 50a33762776..38323f5958d 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -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;
diff --git a/mysql-test/t/isolation.test b/mysql-test/t/isolation.test
index d9750ecb351..2a1a0ee79be 100644
--- a/mysql-test/t/isolation.test
+++ b/mysql-test/t/isolation.test
@@ -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;
 
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index e780e9ec528..a4a29c76e65 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -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