Merge lp://staging/~linuxjedi/drizzle/trunk-bug-689448 into lp://staging/drizzle/7.0
Proposed by
Andrew Hutchings
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2006 |
| Merged at revision: | 2011 |
| Proposed branch: | lp://staging/~linuxjedi/drizzle/trunk-bug-689448 |
| Merge into: | lp://staging/drizzle/7.0 |
| Diff against target: |
49 lines (+18/-2) 3 files modified
drizzled/session.h (+1/-2) plugin/innobase/tests/r/innodb_trx.result (+6/-0) plugin/innobase/tests/t/innodb_trx.test (+11/-0) |
| To merge this branch: | bzr merge lp://staging/~linuxjedi/drizzle/trunk-bug-689448 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Avoid assert when retrieving an empty query string for the data_dictionary
An assert on this table keeps cropping at various stages (3rd time now) so added a test case too.
To post a comment you must log in.
Revision history for this message
| Brian Aker (brianaker) wrote | # |
Revision history for this message
| Andrew Hutchings (linuxjedi) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi!
In this code you are working with a shared_ptr. This means that though you check it in one call, there is a chance it will have been changed by the time the second call is made. Either you need to make the call in just a single call, or you need to copy the shared_ptr locally and then make use of it from there.
Cheers,
-Brina