lp:~oontvoo/akiban-server/assertion-error-bug1084743

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~akiban-technologies/akiban-server/trunk at revision 2616

Yuval Shavit (community): Approve on 2013-04-08

Vy Nguyen (community): Needs Resubmitting on 2013-04-08

Diff: 203 lines (+39/-9)

9 files modified

src/main/java/com/akiban/server/types3/common/funcs/BoolLogic.java (+12/-1)
src/main/java/com/akiban/server/types3/common/funcs/Coalesce.java (+2/-1)
src/main/java/com/akiban/server/types3/common/funcs/DescribeExpression.java (+2/-1)
src/main/java/com/akiban/server/types3/common/funcs/Elt.java (+2/-1)
src/main/java/com/akiban/server/types3/mcompat/mfuncs/MArithmetic.java (+1/-1)
src/main/java/com/akiban/server/types3/mcompat/mfuncs/MIfElse.java (+2/-1)
src/main/java/com/akiban/server/types3/texpressions/TPreptimeErrorScalar.java (+1/-1)
src/main/java/com/akiban/server/types3/texpressions/TScalarBase.java (+2/-2)
src/test/resources/com/akiban/sql/pg/yaml/functional/test-bool-logic.yaml (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2616. By Vy Nguyen on 2013-04-08

remove import Constantness in TScalar.java

2615. By Vy Nguyen on 2013-04-07

more tests

2614. By Vy Nguyen on 2013-04-06

fix bug 1084743

2613. By Akiban Build User on 2013-04-05

merge mmcm: Fix handling of Postgres Describe command.

https://code.launchpad.net/~mmcm/akiban-server/pg-send-parameter-types/+merge/157241

2612. By Akiban Build User on 2013-04-05

merge mmcm: Include full text indexes in INFORMATION_SCHEMA.INDEXES.

https://code.launchpad.net/~mmcm/akiban-server/is-full-text-indexes/+merge/157229

2611. By Akiban Build User on 2013-04-03

merge nwilliams: Make sure entity DELETE has no Content-Type.

https://code.launchpad.net/~nwilliams/akiban-server/no-content-type-delete/+merge/156993

2610. By Akiban Build User on 2013-04-03

merge nwilliams: Work around for renaming collections until entity.json refactoring is done.

https://code.launchpad.net/~nwilliams/akiban-server/entity-json-rename-collection/+merge/156967

2609. By Akiban Build User on 2013-04-03

merge tjoneslo: Fix bug 1163967 - Update the delete processing for both the entity and the builder to return no body and a 204 (no content) status code.

https://code.launchpad.net/~tjoneslo/akiban-server/fix-bug-1163967/+merge/156904

2608. By Akiban Build User on 2013-04-03

merge tjoneslo: Address potential name collision between fields and collections (Tables) in the JSON output.

https://code.launchpad.net/~tjoneslo/akiban-server/json-entity-name-collision-resolution/+merge/156724

2607. By Akiban Build User on 2013-04-01

merge tjoneslo: Add datetime discovery for the REST EntityParser.

https://code.launchpad.net/~tjoneslo/akiban-server/rest-parse-dates-timestamp/+merge/156384