Commit 7dd56817 authored by unknown's avatar unknown

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
parent 54549a97
...@@ -2509,6 +2509,12 @@ Tek-Tips Forums are 800+ independent peer-to-peer non-commercial support ...@@ -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 forums for Computer Professionals. Features include automatic e-mail
notification of responses, a links library, and member confidentiality notification of responses, a links library, and member confidentiality
guaranteed. 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 @end itemize
There are also many Web pages that use There are also many Web pages that use
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
MYSQLDATAdir = $(localstatedir) MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) 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 pkglib_LIBRARIES = libmysys.a
LDADD = libmysys.a ../dbug/libdbug.a \ LDADD = libmysys.a ../dbug/libdbug.a \
../strings/libmystrings.a ../strings/libmystrings.a
......
...@@ -542,7 +542,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, ...@@ -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)))) HA_OPEN_IGNORE_IF_LOCKED) | ha_open_flags))))
{ {
/* Set a flag if the table is crashed and it can be auto. repaired */ /* 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() && outparam->file->auto_repair() &&
!(ha_open_flags & HA_OPEN_FOR_REPAIR)); !(ha_open_flags & HA_OPEN_FOR_REPAIR));
goto err_not_open; /* purecov: inspected */ goto err_not_open; /* purecov: inspected */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment