BIND 10 master, updated. f45931cc8a5c0924d77fb6c6681eeb467dc91302 [master] ChangeLog for merge of trac2653

[BIND 10 source code commits]

The branch, master has been updated
       via  f45931cc8a5c0924d77fb6c6681eeb467dc91302 (commit)
       via  da3579feea036aa2b7d094b1c260a80a69d2f9aa (commit)
       via  969260c87bd0916bfa951f4801bc7e4e60872fe2 (commit)
       via  298fd19fe3405ccc76d5d7ab8f91d80c53bcf44b (commit)
      from  6f344e77217625e36e924f41c24d88ac0ba685be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f45931cc8a5c0924d77fb6c6681eeb467dc91302
Author: Stephen Morris <stephen at isc.org>
Date:   Tue May 21 14:56:51 2013 +0100

    [master] ChangeLog for merge of trac2653

commit da3579feea036aa2b7d094b1c260a80a69d2f9aa
Merge: 6f344e7 969260c
Author: Stephen Morris <stephen at isc.org>
Date:   Tue May 21 14:52:42 2013 +0100

    [master] Merge branch 'trac2653'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                             |    6 +++++
 src/lib/dhcpsrv/database_backends.dox |   45 ++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index f3ca6a5..8d051c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+616.	[doc]		stephen
+	Added description to the DHCP "Database Back-Ends" section of the
+	BIND 10 Developer's Guide about how to set up a MySQL database for
+	testing the DHCP MySQL backend.
+	(Trac #2653, git da3579feea036aa2b7d094b1c260a80a69d2f9aa)
+
 615.	[bug]		jinmei
 	b10-auth: Avoid referencing to a freed object when authoritative
 	server addresses are reconfigured.  It caused a crash on a busy
diff --git a/src/lib/dhcpsrv/database_backends.dox b/src/lib/dhcpsrv/database_backends.dox
index 43594fd..174b5e2 100644
--- a/src/lib/dhcpsrv/database_backends.dox
+++ b/src/lib/dhcpsrv/database_backends.dox
@@ -26,7 +26,7 @@
 
   - The MySQL lease manager uses the freely available MySQL as its backend
   database.  This is not included in BIND 10 DHCP by default:
-  the --with-dhcp-mysql switch must be supplied to "configure" for support
+  the \--with-dhcp-mysql switch must be supplied to "configure" for support
   to be compiled into the software.
   - Memfile is an in-memory lease database, with (currently) nothing being
   written to persistent storage.  The long-term plans for the backend do
@@ -83,9 +83,42 @@
 
   @subsection dhcp-mysql-unittest MySQL
 
-  A database called <i>keatest</i> needs to be set up using the MySQL
-  <b>CREATE DATABASE</b> command.  A database user, also called <i>keatest</i>
-  (with a password <i>keatest</i>) must be given full privileges in that
-  database.  The unit tests create the schema in the database before each test
-  and delete it afterwards.
+  A database called <i>keatest</i> must be created. A database user, also called
+  <i>keatest</i> (and with a password <i>keatest</i>) must also be created and
+  be given full privileges in that database.  The unit tests create the schema
+  in the database before each test and delete it afterwards.
+
+  In detail, the steps to create the database and user are:
+
+  -# Log into MySQL as root:
+  @verbatim
+  % mysql -u root -p
+  Enter password:
+     :
+  mysql>@endverbatim\n
+  -# Create the test database.  This must be called "keatest":
+  @verbatim
+  mysql> CREATE DATABASE keatest;
+  mysql>@endverbatim\n
+  -# Create the user under which the test client will connect to the database
+  (the apostrophes around the words <i>keatest</i> and <i>localhost</i> are
+  required):
+  @verbatim
+  mysql> CREATE USER 'keatest'@'localhost' IDENTIFIED BY 'keatest';
+  mysql>@endverbatim\n
+  -# Grant the created user permissions to access the <i>keatest</i> database
+  (again, the apostrophes around the words <i>keatest</i> and <i>localhost</i>
+  are required):
+  @verbatim
+  mysql> GRANT ALL ON keatest.* TO 'keatest'@'localhost';
+  mysql>@endverbatim\n
+  -# Exit MySQL:
+  @verbatim
+  mysql> quit
+  Bye
+  %@endverbatim
+
+  The unit tests are run automatically when "make check" is executed (providing
+  that BIND 10 has been build with the \--with-dhcp-mysql switch (see the installation
+  section in the <a href="http://bind10.isc.org/docs/bind10-guide.html">BIND 10 Guide</a>).
   */