Skip to content

Commit 8493c93

Browse files
author
Richard Jones
committed
Fix a couple of failures in mysql backend unit tests.
Fix the mysql backend docs Note requirement of MySQL version 4.0+ with InnoDB or BDB mysql backend
1 parent cab9e91 commit 8493c93

File tree

6 files changed

+322
-96
lines changed

6 files changed

+322
-96
lines changed

CHANGES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ are given with the most recent entry first.
44
200?-??-?? 0.7.0
55
Feature:
66
- support confirming registration by replying to the email (sf bug 763668)
7+
- support setgid and running on port < 1024 (sf patch 777528)
8+
9+
Fixed:
10+
- mysql documentation fixed to note requirement of 4.0+ and InnoDB
711

812

913
2003-10-?? 0.6.3

doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PYTHON = /usr/bin/python2
22
STXTOHTML = rst2html
33

44
SOURCE = announcement.txt customizing.txt developers.txt FAQ.txt features.txt \
5-
glossary.txt implementation.txt index.txt design.txt \
5+
glossary.txt implementation.txt index.txt design.txt mysql.txt \
66
installation.txt upgrading.txt user_guide.txt maintenance.txt
77

88
COMPILED := $(SOURCE:.txt=.html)

doc/installation.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Installing Roundup
33
==================
44

5-
:Version: $Revision: 1.58 $
5+
:Version: $Revision: 1.59 $
66

77
.. contents::
88

@@ -244,8 +244,9 @@ There's several to choose from, each with benefits and limitations:
244244
**mysql**
245245
Backend for popular RDBMS MySQL. According to benchmarks, this backend works
246246
much faster than any of \*dbm ones, but slightly slower than metakit and
247-
sqlite. A good scalability is not a property of this backend for now,
248-
though. For more info on backend installation see doc/mysql.txt.
247+
sqlite. Scalability is unknown at present. Roundup requires InnoDB or BDB
248+
support in MySQL. For more info on requirements and installation see
249+
`additional mysql documentation`_ (doc/mysql.txt)
249250
**metakit**
250251
This backend is implemented over the metakit_ storage system, using Mk4Py as
251252
the interface. It scales much better than the dbm backends.
@@ -584,4 +585,5 @@ Next: `User Guide`_
584585
.. _`maintenance documentation`: maintenance.html
585586
.. _sqlite: http://www.hwaci.com/sw/sqlite/
586587
.. _metakit: http://www.equi4.com/metakit/
588+
.. _`additional mysql documentation`: doc/mysql.html
587589

doc/mysql.txt

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
MySQL Backend
33
=============
44

5-
This notes detail the MySQL backend for the roundup issue tracker.
5+
:version: $Revision: 1.5 $
6+
7+
This notes detail the MySQL backend for the Roundup issue tracker.
68

79

810
Prerequisites
@@ -11,10 +13,10 @@ Prerequisites
1113
To use MySQL as the backend for storing roundup data, you also need
1214
to install:
1315

14-
1. MySQL RDBMS 3.23.34 or higher - http://www.mysql.com. Your MySQL
15-
installation should support Berkeley DB (BDB) tables for transaction
16-
support.
17-
2. Python MySQL interface - http://sourceforge.net/projects/mysql-python
16+
1. MySQL RDBMS 4.0 or higher - http://www.mysql.com. Your MySQL
17+
installation MUST support InnoDB tables (or Berkeley DB (BDB) tables
18+
if you have no other choice)
19+
2. Python MySQL interface - http://sourceforge.net/projects/mysql-python
1820

1921

2022
Running the MySQL tests
@@ -23,16 +25,19 @@ Running the MySQL tests
2325
Roundup tests expect an empty MySQL database. Two alternate ways to provide
2426
this:
2527

26-
1. If you have root permissions on the MySQL server, you can create
27-
the necessary database entries using this SQL sequence:
28+
1. If you have root permissions on the MySQL server, you can create
29+
the necessary database entries using the follwing SQL sequence. Use
30+
``mysql`` on the command line to enter::
2831

29-
CREATE DATABASE rounduptest
30-
GRANT ALL PRIVILEGES ON rounduptest TO rounduptest@localhost IDENTIFIED BY 'rounduptest'
31-
FLUSH PRIVILEGES
32+
CREATE DATABASE rounduptest;
33+
USE rounduptest;
34+
GRANT ALL PRIVILEGES ON rounduptest.* TO rounduptest@localhost
35+
IDENTIFIED BY 'rounduptest';
36+
FLUSH PRIVILEGES;
3237

33-
2. If your administrator has provided you with database connection info,
34-
you can modify MYSQL_* constants in the file test/test_db.py with
35-
the correct values.
38+
2. If your administrator has provided you with database connection info,
39+
you can modify MYSQL_* constants in the file test/test_db.py with
40+
the correct values.
3641

3742
Note that the MySQL database should not contain any tables. Tests will not
3843
drop the database with existing data.
@@ -43,19 +48,17 @@ Additional configuration
4348

4449
To initialise and use the MySQL database backend, roundup's configuration
4550
file (config.py in the tracker's home directory) should have the following
46-
entries:
51+
entries::
4752

4853
MYSQL_DBHOST = 'localhost'
4954
MYSQL_DBUSER = 'rounduptest'
5055
MYSQL_DBPASSWORD = 'rounduptest'
5156
MYSQL_DBNAME = 'rounduptest'
52-
MYSQL_DATABASE = ( MYSQL_DBHOST, MYSQL_DBUSER, MYSQL_DBPASSWORD, MYSQL_DBNAME )
57+
MYSQL_DATABASE = ( MYSQL_DBHOST, MYSQL_DBUSER, MYSQL_DBPASSWORD,
58+
MYSQL_DBNAME )
5359

5460
Fill in the first four entries with values for your local MySQL installation
55-
before running "roundup-admin initialise".
56-
57-
58-
Andrey Lebedev <[email protected]>
59-
61+
before running "roundup-admin initialise". Use the commands in the `Running the
62+
MySQL tests` to set up a database if you have privilege, or ask your local
63+
administrator if not.
6064

61-
vim: et tw=80

0 commit comments

Comments
 (0)