Merge lp://qastaging/~mordred/drizzle/sqlalchemy-date into lp://qastaging/drizzle/7.0

Proposed by Monty Taylor
Status: Merged
Approved by: Monty Taylor
Approved revision: 2198
Merged at revision: 2203
Proposed branch: lp://qastaging/~mordred/drizzle/sqlalchemy-date
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 140 lines (+24/-19)
5 files modified
drizzled/errmsg_print.h (+3/-3)
drizzled/sys_var.h (+1/-1)
plugin/logging_query/logging_query.cc (+5/-0)
plugin/mysql_protocol/mysql_protocol.cc (+14/-14)
tests/r/metadata.result (+1/-1)
To merge this branch: bzr merge lp://qastaging/~mordred/drizzle/sqlalchemy-date
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Lee Bieber (community) Needs Fixing
Review via email: mp+51005@code.qastaging.launchpad.net

Description of the change

fixes sqla/python mysqldb date processing

To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Test failure on many several platforms

main.metadata [ fail ]
--- .././tests/r/metadata.result 2011-02-24 18:34:42.505898000 +0300
+++ .././tests/r/metadata.reject 2011-02-24 18:54:53.774059949 +0300
@@ -19,7 +19,7 @@
 def test t1 t1 f f 2 3 0 Y 32768 2 63
 def test t1 t1 g g 2 4 0 Y 32768 3 63
 def test t1 t1 h h 9 7 0 Y 0 4 63
-def test t1 t1 j j 7 10 0 Y 128 0 63
+def test t1 t1 j j 15 10 0 Y 128 0 63
 def test t1 t1 k k 4 26 0 Y 128 0 63
 def test t1 t1 l l 6 19 0 Y 128 0 63
 def test t1 t1 m m 10 4 0 Y 256 0 45

drizzletest: Result content mismatch

review: Needs Fixing
2198. By Monty Taylor

And fix the test case, because the over-the-wire type el-changed-o.

Revision history for this message
Monty Taylor (mordred) wrote :

Should be fixed-o now.

review: Approve

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