Drizzle

Merge lp://qastaging/~brianaker/drizzle/sql_state_to_error into lp://qastaging/drizzle/7.0

  1. sql_state_to_error
  2. Merge into 7.0
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: no longer in the source branch.
Merged at revision: 2138
Proposed branch: lp://qastaging/~brianaker/drizzle/sql_state_to_error
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 245 lines (+31/-18)
8 files modified
drizzled/error/sql_state.cc (+6/-2)
drizzled/error/sql_state.h (+9/-6)
drizzled/include.am (+4/-4)
plugin/drizzle_protocol/drizzle_protocol.cc (+0/-1)
plugin/error_dictionary/errors.cc (+4/-0)
plugin/mysql_protocol/mysql_protocol.cc (+3/-3)
plugin/mysql_unix_socket_protocol/protocol.cc (+0/-1)
plugin/schema_dictionary/tests/r/data_dictionary.result (+5/-1)
To merge this branch: bzr merge lp://qastaging/~brianaker/drizzle/sql_state_to_error
Reviewer Review Type Date Requested Status
David Shrewsbury (community) Needs Fixing
Review via email: mp+48410@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Add ERROR_SQL_STATE to the errors table (ie, make it so that you can look them up).

Revision history for this message
David Shrewsbury (dshrews) wrote :

You've included a merge conflict in the data_dictionary.result file:

+<<<<<<< TREE
557
+=======
+559
+>>>>>>> MERGE-SOURCE

review: Needs Fixing
lp://qastaging/~brianaker/drizzle/sql_state_to_error updated
2138. By Brian Aker

Fix conflict.

2139. By Brian Aker

Just shuffle over sql_state to be in the error system.

Revision history for this message
Brian Aker (brianaker) wrote :

Thanks, got it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches