Merge back doc changes from HEAD.

Author: Johannes Gijsbers

doc/mysql.txt

@@ -2,7 +2,9 @@
 MySQL Backend
 =============
 
-This notes detail the MySQL backend for the roundup issue tracker.
+:version: $Revision: 1.4.2.1 $
+
+This notes detail the MySQL backend for the Roundup issue tracker.
 
 
 Prerequisites
@@ -11,10 +13,10 @@ Prerequisites
 To use MySQL as the backend for storing roundup data, you also need 
 to install:
 
-    1. MySQL RDBMS 3.23.34 or higher - http://www.mysql.com. Your MySQL
-       installation should support Berkeley DB (BDB) tables for transaction
-       support.
-    2. Python MySQL interface - http://sourceforge.net/projects/mysql-python
+1. MySQL RDBMS 4.0 or higher - http://www.mysql.com. Your MySQL
+   installation MUST support InnoDB tables (or Berkeley DB (BDB) tables
+   if you have no other choice)
+2. Python MySQL interface - http://sourceforge.net/projects/mysql-python
 
 
 Running the MySQL tests
@@ -23,16 +25,19 @@ Running the MySQL tests
 Roundup tests expect an empty MySQL database. Two alternate ways to provide 
 this:
 
-    1. If you have root permissions on the MySQL server, you can create 
-       the necessary database entries using this SQL sequence:
+1. If you have root permissions on the MySQL server, you can create 
+   the necessary database entries using the follwing SQL sequence. Use
+   ``mysql`` on the command line to enter::
 
-       CREATE DATABASE rounduptest
-       GRANT ALL PRIVILEGES ON rounduptest TO rounduptest@localhost IDENTIFIED BY 'rounduptest'
-       FLUSH PRIVILEGES
+       CREATE DATABASE rounduptest;
+       USE rounduptest;
+       GRANT ALL PRIVILEGES ON rounduptest.* TO rounduptest@localhost
+            IDENTIFIED BY 'rounduptest';
+       FLUSH PRIVILEGES;
 
-    2. If your administrator has provided you with database connection info, 
-       you can modify MYSQL_* constants in the file test/test_db.py with 
-       the correct values.
+2. If your administrator has provided you with database connection info, 
+   you can modify MYSQL_* constants in the file test/test_db.py with 
+   the correct values.
 
 Note that the MySQL database should not contain any tables. Tests will not 
 drop the database with existing data.
@@ -43,19 +48,17 @@ Additional configuration
 
 To initialise and use the MySQL database backend, roundup's configuration 
 file (config.py in the tracker's home directory) should have the following
-entries:
+entries::
 
     MYSQL_DBHOST = 'localhost'
     MYSQL_DBUSER = 'rounduptest'
     MYSQL_DBPASSWORD = 'rounduptest'
     MYSQL_DBNAME = 'rounduptest'
-    MYSQL_DATABASE = ( MYSQL_DBHOST, MYSQL_DBUSER, MYSQL_DBPASSWORD, MYSQL_DBNAME )
+    MYSQL_DATABASE = ( MYSQL_DBHOST, MYSQL_DBUSER, MYSQL_DBPASSWORD,
+        MYSQL_DBNAME )
 
 Fill in the first four entries with values for your local MySQL installation 
-before running "roundup-admin initialise". 
-
-
-    Andrey Lebedev <[email protected]>
-
+before running "roundup-admin initialise".  Use the commands in the `Running the
+MySQL tests` to set up a database if you have privilege, or ask your local
+administrator if not.
 
- vim: et tw=80