Merge branch '0.9.x' into 1.0.x

2010-03-29 15:15:51 -07:00
parent e2d3ebb9f4 cfeb1bfa41
commit 01a03e34c8
63 changed files with 3129 additions and 2998 deletions
--- a/lib/default.php
+++ b/lib/default.php
@@ -72,6 +72,7 @@ $default =
              'quote_identifiers' => false,
              'type' => 'mysql',
              'schemacheck' => 'runtime', // 'runtime' or 'script'
+              'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
              'log_queries' => false, // true to log all DB queries
              'log_slow_queries' => 0), // if set, log queries taking over N seconds
        'syslog' =>