diff options
| author | unknown <joerg@trift2.> | 2006-09-22 17:24:06 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-09-22 17:24:06 +0200 |
| commit | 00959e4da4d230e8ab51392a13ad36055f0ad77a (patch) | |
| tree | cc7ed27391c6768a4e3d32bdac17fa34479a4a1c /Docs | |
| parent | b0d956fefd27b804f7db793afad5e5aef5a33be3 (diff) | |
| parent | fcd21bd4ad5b1837ab292880bf113894488b45bb (diff) | |
| download | mariadb-git-00959e4da4d230e8ab51392a13ad36055f0ad77a.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
Docs/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 2 | ||||
| -rw-r--r-- | Docs/manual.chm | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 3e81cc8b7e1..40e987bb254 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -16,7 +16,7 @@ noinst_SCRIPTS = generate-text-files.pl -EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY +EXTRA_DIST = $(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/Docs/manual.chm b/Docs/manual.chm new file mode 100644 index 00000000000..28c3e1b5a86 --- /dev/null +++ b/Docs/manual.chm @@ -0,0 +1,14 @@ + +********************************************************* + +This is a dummy placeholder file for "manual.chm" in the +MySQL source trees. + +Note, that the documentation has been moved into a separate +BitKeeper source tree named "mysqldoc" - do not attempt to edit this +file! All changes to it should be done in the mysqldoc tree. + +This dummy file is being replaced with the actual file from the +mysqldoc tree when building the official source distribution. + +********************************************************* |