BIND 10 master, updated. 1197c10bcfc5b9a47054a7dc98cb797c14175053 Merge branch 'master' into trac2699_2

[BIND 10 source code commits]

The branch, master has been updated
       via  1197c10bcfc5b9a47054a7dc98cb797c14175053 (commit)
       via  97371cff7f91db7556294ce559aed170a718dc4c (commit)
       via  54bbed5fcbe237c5a49b515ae4c55148723406ce (commit)
      from  aff7100abe378e77ed36e6239a82ca483bcd2288 (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 1197c10bcfc5b9a47054a7dc98cb797c14175053
Merge: 97371cf aff7100
Author: Thomas Markwalder <tmark at isc.org>
Date:   Tue Feb 12 09:09:00 2013 -0500

    Merge branch 'master' into trac2699_2

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

Summary of changes:
 src/lib/dhcpsrv/dhcpdb_create.mysql |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcpsrv/dhcpdb_create.mysql b/src/lib/dhcpsrv/dhcpdb_create.mysql
index 695091d..f0da337 100644
--- a/src/lib/dhcpsrv/dhcpdb_create.mysql
+++ b/src/lib/dhcpsrv/dhcpdb_create.mysql
@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Internet Systems Consortium.
+# Copyright (C) 2012-2013  Internet Systems Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -39,6 +39,14 @@ CREATE TABLE lease4 (
     subnet_id INT UNSIGNED                      # Subnet identification
     ) ENGINE = INNODB;
 
+
+# Create search indexes for lease4 table 
+# index by hwaddr and subnet_id
+CREATE INDEX lease4_by_hwaddr_subnet_id ON lease4 (hwaddr, subnet_id);
+
+# index by client_id and subnet_id
+CREATE INDEX lease4_by_client_id_subnet_id ON lease4 (client_id, subnet_id);
+
 # Holds the IPv6 leases.
 # N.B. The use of a VARCHAR for the address is temporary for development:
 # it will eventually be replaced by BINARY(16).
@@ -55,6 +63,10 @@ CREATE TABLE lease6 (
     prefix_len TINYINT UNSIGNED                 # For IA_PD only
     ) ENGINE = INNODB;
 
+# Create search indexes for lease4 table 
+# index by iaid, subnet_id, and duid 
+CREATE INDEX lease6_by_iaid_subnet_id_duid ON lease6 (iaid, subnet_id, duid);
+
 # ... and a definition of lease6 types.  This table is a convenience for
 # users of the database - if they want to view the lease table and use the
 # type names, they can join this table with the lease6 table