diff options
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 3 | ||||
| -rwxr-xr-x | Docs/README.1st | 76 | ||||
| -rw-r--r-- | Docs/internals.texi | 101 |
3 files changed, 178 insertions, 2 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index bf7aaa747e3..fd3e9758bf6 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -22,7 +22,7 @@ targets = manual.txt mysql.info manual.html BUILT_SOURCES = $(targets) manual_toc.html include.texi EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \ - INSTALL-BINARY reservedwords.texi + INSTALL-BINARY reservedwords.texi internals.texi all: $(targets) txt_files @@ -156,7 +156,6 @@ manual_letter.de.ps: manual.de.texi include.texi $(DVIPS) -t letter manual.de.dvi -o $@ touch $@ - # # Miscellaneous # diff --git a/Docs/README.1st b/Docs/README.1st new file mode 100755 index 00000000000..980c043224a --- /dev/null +++ b/Docs/README.1st @@ -0,0 +1,76 @@ +This ALPHA build of MySQL 4.1 for the Windows platform does not come +with an installer. A full-featured installer is being developed for the +4.1 series, and it is scheduled to be released with MySQL 4.1 BETA. + +** FRESH INSTALL ** + +To install MySQL 4.1 as a 'fresh' install, unzip this archive to a directory +of your choice (we suggest 'c:\', which will cause MySQL to be installed in +a directory named 'mysql' in 'c:\'). You should then follow the directions +in the user manual for starting/stopping MySQL: + +(Windows 9x/ME) http://www.mysql.com/doc/en/Win95_start.html +(Windows NT/2000/XP) http://www.mysql.com/doc/en/NT_start.html + +** UPGRADE INSTALL ** + +To install MySQL 4.1 as an upgrade to your current version of MySQL, you need +to perform the following steps: + +* Back up your original installation (always a good idea!) + +* Unzip the 4.1 archive to a directory that is different than where your + current MySQL installation is located. (Or, if you do unzip this + archive into the same location as your existing installation, do NOT + unpack the 'data' subdirectory. If you unpack the 'data' directory, + your existing databases will be overwritten.) + +* Shut down all MySQL server processes/services. + +* Remove the Win32 MySQL service (if appropriate for your OS): + + c:\mysql\bin\mysqld-nt --remove + +* Exit 'WinMySQLAdmin' (if it is running). + +* If you unzipped this archive into a directory different than that + of your existing MySQL installation, copy from the archive all its + directories and their contents EXCEPT the 'data' directory into the + existing installation. + +* Start the MySQL server with the '--skip-grant-tables' option. Assuming + your MySQL installation is located at 'c:\mysql', the command looks like + this: + + c:\mysql\bin\mysqld-opt --skip-grant-tables + + If your installation is located in some other directory, adjust the + pathname in that command (and in the following commands). + +* Execute the 'mysql_fix_privilege_tables.sql' script that is located in + the 'scripts' directory: + + c:\mysql\bin\mysql -f mysql < c:\mysql\scripts\mysql_fix_privilege_tables.sql + + This script performs any actions necessary to convert your grant tables + to the current format. You may see some "duplicate column" warnings as + it runs; these can be ignored. + +* Stop the server: + + c:\mysql\bin\mysqladmin -u root shutdown + +* Re-install the Win32 MySQL service (if required): + + c:\mysql\bin\mysqld-nt --install + +* Re-start the server or service using your normal startup procedure. + +** Further Questions ** + +You can find further information about running MySQL on Windows in the +manual that ships in the 'Doc' subdirectory, or online at the MySQL AB +web site: + +http://www.mysql.com/doc/en/Windows.html + diff --git a/Docs/internals.texi b/Docs/internals.texi new file mode 100644 index 00000000000..e1462531270 --- /dev/null +++ b/Docs/internals.texi @@ -0,0 +1,101 @@ +\input texinfo @c -*-texinfo-*- +@c +@c ********************************************************* +@c +@c This is a dummy placeholder file for internals.texi in the +@c MySQL source trees. +@c +@c Note, that the internals documentation has been moved into a separate +@c BitKeeper source tree named "mysqldoc" - do not attempt to edit this +@c file! All changes to internals.texi should be done in the mysqldoc tree. +@c +@c See http://www.mysql.com/doc/en/Installing_source_tree.html +@c for information about how to work with BitKeeper source trees. +@c +@c This dummy file is being replaced with the actual file from the +@c mysqldoc tree when building the official source distribution. +@c +@c Please e-mail docs@mysql.com for more information or if +@c you are interested in doing a translation. +@c +@c ********************************************************* +@c +@c %**start of header + +@setfilename internals.info + +@c We want the types in the same index +@syncodeindex tp fn + +@ifclear tex-debug +@c This removes the black squares in the right margin +@finalout +@end ifclear + +@c Set background for HTML +@set _body_tags BGCOLOR=silver TEXT=#000000 LINK=#101090 VLINK=#7030B0 +@c Set some style elements for the manual in HTML form. 'suggested' +@c natural language colors: aqua, black, blue, fuchsia, gray, green, +@c lime, maroon, navy, olive, purple, red, silver, teal, white, and +@c yellow. From Steeve Buehler <ahr@YogElements.com> +@set _extra_head <style> code {color:purple} tt {color:green} samp {color:navy} pre {color:maroon} </style> + +@settitle Dummy MySQL internals documentation for version @value{mysql_version}. + +@c We want single-sided heading format, with chapters on new pages. To +@c get double-sided format change 'on' below to 'odd' +@setchapternewpage on + +@paragraphindent 0 + +@c %**end of header + +@ifinfo +@format +START-INFO-DIR-ENTRY +* mysql: (mysql). MySQL documentation. +END-INFO-DIR-ENTRY +@end format +@end ifinfo + +@titlepage +@sp 10 +@center @titlefont{Empty placeholder for the MySQL Internals Documentation} +@sp 10 +@center Copyright @copyright{} 1995-2003 MySQL AB +@c blank page after title page makes page 1 be a page front. +@c also makes the back of the title page blank. +@page +@end titlepage + +@c This should be added. The HTML conversion also needs a MySQL version +@c number somewhere. + +@iftex +@c change this to double if you want formatting for double-sided +@c printing +@headings single + +@oddheading @thischapter @| @| @thispage +@evenheading @thispage @| @| MySQL Internal Reference for Version @value{mysql_version} + +@end iftex + +@node Top, (dir), (dir), (dir) + +@ifinfo +This is an empty placeholder file for the MySQL internals documentation. + +The real version of this file is now maintained in a separate BitKeeper +source tree! Please see +@url{http://www.mysql.com/doc/en/Installing_source_tree.html} for more info +on how to work with BitKeeper. + +Please do not attempt to edit this file directly - use the one in the +@code{mysqldoc} BK tree instead. + +This file will be replaced with the current @code{internals.texi} when +building the official source distribution. +@end ifinfo + +@bye |