diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-21 19:01:29 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-21 19:01:29 +0200 |
| commit | 7dd56817a5069eb0210c8e590729973cd98a4acb (patch) | |
| tree | 9d8190b8f127f3726a46363e912d4545859d5b50 | |
| parent | 54549a97def4736a1760e8f9181260ee220d3dc1 (diff) | |
| download | mariadb-git-7dd56817a5069eb0210c8e590729973cd98a4acb.tar.gz | |
Fixed compilation in another dir
Docs/manual.texi:
Added some general links
mysys/Makefile.am:
Fixed compilation of test_thr_lock in another directory
sql/table.cc:
cleanup
| -rw-r--r-- | Docs/manual.texi | 6 | ||||
| -rw-r--r-- | mysys/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index c2e492b1e76..0172428a195 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -2509,6 +2509,12 @@ Tek-Tips Forums are 800+ independent peer-to-peer non-commercial support forums for Computer Professionals. Features include automatic e-mail notification of responses, a links library, and member confidentiality guaranteed. + +@item @uref{http://www.public.asu.edu/~peterjn/btree/, B-tree paper} +B-Trees: Balanced Tree Data Structures + +@item @uref{http://www.fit.qut.edu.au/~maire/baobab/lecture/sld001.htm, B-tree lecture} +A lecture about B-Trees @end itemize There are also many Web pages that use diff --git a/mysys/Makefile.am b/mysys/Makefile.am index a53fc1a545c..748bbad3daf 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -17,7 +17,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) -INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. +INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. -I$(srcdir) pkglib_LIBRARIES = libmysys.a LDADD = libmysys.a ../dbug/libdbug.a \ ../strings/libmystrings.a diff --git a/sql/table.cc b/sql/table.cc index c840b36da05..70efd41425c 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -542,7 +542,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, HA_OPEN_IGNORE_IF_LOCKED) | ha_open_flags)))) { /* Set a flag if the table is crashed and it can be auto. repaired */ - outparam->crashed=(err == HA_ERR_CRASHED_ON_USAGE && + outparam->crashed=((err == HA_ERR_CRASHED_ON_USAGE) && outparam->file->auto_repair() && !(ha_open_flags & HA_OPEN_FOR_REPAIR)); goto err_not_open; /* purecov: inspected */ |