BIND 10 master, updated. 7212536c15e7374828bb74657d6f6d30cac4160d Merge branch 'trac2968'

[BIND 10 source code commits]

The branch, master has been updated
       via  7212536c15e7374828bb74657d6f6d30cac4160d (commit)
       via  8b82620d477ff1eac478407debdef85286f34f79 (commit)
       via  6f11ce8d8e06bababd2f706e2affc915e3ed1e02 (commit)
       via  99d9be31ae3323ee9f539b01bc74f3797d968e3b (commit)
      from  984abbf9ed6f4b7fb8b0ea884fd5e3ea38469d6f (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 7212536c15e7374828bb74657d6f6d30cac4160d
Merge: 984abbf 8b82620
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jun 10 18:11:31 2013 +0530

    Merge branch 'trac2968'

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

Summary of changes:
 src/bin/dbutil/tests/dbutil_test.sh.in |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/dbutil/tests/dbutil_test.sh.in b/src/bin/dbutil/tests/dbutil_test.sh.in
index f14c564..e11c01b 100755
--- a/src/bin/dbutil/tests/dbutil_test.sh.in
+++ b/src/bin/dbutil/tests/dbutil_test.sh.in
@@ -140,7 +140,24 @@ get_schema() {
     db1=@abs_builddir@/dbutil_test_schema_$$
     copy_file $1 $db1
 
+    # The purpose of the following sed command is to join multi-line SQL
+    # statements to form single-line SQL statements.
+    #
+    # The sed command is explained as follows:
+    # ':a' creates a new label "a"
+    # 'N' appends the next line to the pattern space
+    # '$!ba' if it's not the last line, branch to "a"
+    #
+    # The above makes sed loop over the entire sqlite3 output. At this
+    # point, the pattern space contain all lines in the sqlite3 output.
+    #
+    # 's/,[\ ]*\n/, /g' then substitutes lines trailing with comma
+    # followed by zero or more spaces and the newline character, with
+    # just a comma and a single space.
+
     db_schema=`sqlite3 $db1 '.schema' | \
+               sed -e ':a' -e 'N' -e '$!ba' -e 's/,[\ ]*\n/, /g' | \
+               sort | \
                awk '{line = line $0} END {print line}' | \
                sed -e 's/ //g' | \
                tr [:upper:] [:lower:]`