1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
unknown 2001-09-18 05:17:53 +03:00
commit 9c34eaafb1
5 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@ -683,15 +683,17 @@ int main()
AC_MSG_RESULT($atom_ops) AC_MSG_RESULT($atom_ops)
AC_ARG_WITH(pstack, 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=$withval],
[USE_PSTACK=yes]) [USE_PSTACK=yes])
pstack_libs= pstack_dirs= pstack_libs=
if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i386" pstack_dirs=
pstack_makefile=
if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i686"
then then
have_libiberty= have_libbfd= have_libiberty= have_libbfd=
my_save_LIBS="$LIBS" 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], AC_CHECK_LIB([iberty], [fdmatch],
[have_libiberty=yes [have_libiberty=yes
AC_CHECK_LIB([bfd], [bfd_openr], [have_libbfd=yes], , [-liberty])]) 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 then
pstack_dirs='$(top_srcdir)'/pstack pstack_dirs='$(top_srcdir)'/pstack
pstack_libs="$pstack_dirs/libpstack.a -lbfd -liberty" pstack_libs="$pstack_dirs/libpstack.a -lbfd -liberty"
pstack_makefile=pstack/Makefile
AC_SUBST([pstack_dirs]) AC_SUBST([pstack_dirs])
AC_SUBST([pstack_libs]) AC_SUBST([pstack_libs])
AC_DEFINE([USE_PSTACK]) AC_DEFINE([USE_PSTACK])
@ -2219,7 +2222,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
man/Makefile readline/Makefile vio/Makefile \ man/Makefile readline/Makefile vio/Makefile \
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \ libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
libmysql/Makefile client/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 \ merge/Makefile dbug/Makefile scripts/Makefile \
include/Makefile sql-bench/Makefile tools/Makefile \ include/Makefile sql-bench/Makefile tools/Makefile \
tests/Makefile Docs/Makefile support-files/Makefile \ tests/Makefile Docs/Makefile support-files/Makefile \

12
libmysqld/Makefile.am
View File

@ -30,14 +30,14 @@ INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \
## XXX: should we use client or server LDFLAGS for libmysqld? ## XXX: should we use client or server LDFLAGS for libmysqld?
LDADD = @CLIENT_EXTRA_LDFLAGS@ libmysqld.la LDADD = @CLIENT_EXTRA_LDFLAGS@ libmysqld.la
pkglib_LTLIBRARIES = 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 ## 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 \ 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 \ ha_innobase.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \

4
mysql-test/t/drop.test
View File

@ -28,13 +28,13 @@ drop database foo;
# test drop/create database and FLUSH TABLES WITH READ LOCK # test drop/create database and FLUSH TABLES WITH READ LOCK
drop database if exists foo; drop database if exists foo;
flush tables with read lock; flush tables with read lock;
--error 1209,1218; --error 1209,1219;
create database foo; create database foo;
unlock tables; unlock tables;
create database foo; create database foo;
show databases; show databases;
flush tables with read lock; flush tables with read lock;
--error 1208,1218; --error 1208,1219;
drop database foo; drop database foo;
unlock tables; unlock tables;
drop database foo; drop database foo;

3
mysql-test/t/isolation.test
View File

@ -16,7 +16,8 @@ create table t1 (f1 char(20) not null) type = gemini;
insert into t1 (f1) values ("test2"), ("bar"); insert into t1 (f1) values ("test2"), ("bar");
connection master1; connection master1;
set transaction isolation level serializable; set transaction isolation level serializable;
!$-1217 select * from t1; --error 1218
select * from t1;
connection master; connection master;
commit; commit;

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

@ -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 # Test some error conditions with UNION
explain select a,b from t1 union all select a,b from t2; 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; 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; 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; 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; 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; select a,b from t1 union select a from t2;
--error 1217 --error 1218
select * from t1 union select a from t2; select * from t1 union select a from t2;
--error 1217 --error 1218
select a from t1 union select * from t2; select a from t1 union select * from t2;
# Test CREATE, INSERT and REPLACE # Test CREATE, INSERT and REPLACE