diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-12-10 23:27:22 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-12-10 23:27:22 +1100 |
| commit | 516e6a63a80473b3d3a544813caddb1310f8c1dc (patch) | |
| tree | 65089606470f00226eee411ecfe8eed9859cdd86 | |
| parent | c1cdc4cff92ca98e6424d567f15c1ba2f028bbbb (diff) | |
| download | mongo-516e6a63a80473b3d3a544813caddb1310f8c1dc.tar.gz | |
Revert one of the schema plan logic changes: they weren't necessary and introduced bugs.
| -rw-r--r-- | src/schema/schema_plan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/schema/schema_plan.c b/src/schema/schema_plan.c index a9f41e79143..b06b48532ed 100644 --- a/src/schema/schema_plan.c +++ b/src/schema/schema_plan.c @@ -41,13 +41,13 @@ cgcols: cval = colgroup->colconf; } WT_RET(__wt_config_subinit(session, &conf, &cval)); for (; __wt_config_next(&conf, &k, &v) == 0; col++) { - if (k.len == colname->len && + if (cg == matchcg && col == matchcol) + getnext = 1; + if (getnext && k.len == colname->len && strncmp(colname->str, k.str, k.len) == 0) { - if (getnext) { - foundcg = cg; - foundcol = col; - } - getnext = (cg == matchcg && col == matchcol); + foundcg = cg; + foundcol = col; + getnext = 0; } if (cg == 0 && table->ncolgroups > 0 && col == table->nkey_columns - 1) |