summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-10-31 10:44:20 +0200
committerunknown <monty@hundin.mysql.fi>2002-10-31 10:44:20 +0200
commitec952f21f8a4386045f5e5ac6fe44bf856ff2738 (patch)
tree838752100454a55cfd45263336009cdf49830581 /Docs
parent7806888465090c2fa3fb7ef7a8ffb0d149fcff07 (diff)
parentea3ffb9b3efedc03baf011467a0b84f394b1b19e (diff)
downloadmariadb-git-ec952f21f8a4386045f5e5ac6fe44bf856ff2738.tar.gz
Merge
configure.in: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged Docs/manual.texi: SCCS merged
Diffstat (limited to 'Docs')
-rw-r--r--Docs/manual.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 08fbcf0af35..1e1c080d6b3 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -50900,6 +50900,8 @@ Changed output from @code{EXPLAIN} from @code{'where used'} to
@item
Removed variable @code{safe_show_database} as it was not used anymore.
@item
+Read @code{--des-key-file} relative to database directory.
+@item
Small code improvement in multi-table updates
@item
Fixed a newly introduced bug that caused @code{ORDER BY ... LIMIT #}