Drizzle

Merge lp:~fallenpegasus/drizzle/bug-420029 into lp:~drizzle-trunk/drizzle/development

  1. bug-420029
  2. Merge into development
Proposed by Mark Atwood
Status: Merged
Merged at revision: 2353
Proposed branch: lp:~fallenpegasus/drizzle/bug-420029
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 32 lines (+10/-2)
1 file modified
tests/sql-bench/crash-me (+10/-2)
To merge this branch: bzr merge lp:~fallenpegasus/drizzle/bug-420029
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+66398@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/sql-bench/crash-me'
2--- tests/sql-bench/crash-me 2011-06-08 03:02:27 +0000
3+++ tests/sql-bench/crash-me 2011-06-29 22:36:37 +0000
4@@ -977,9 +977,13 @@
5 ["NOW","now","now()",0,2], # Any value is acceptable
6 ["CURDATE","curdate","curdate()",0,2],
7 ["CURTIME","curtime","curtime()",0,2],
8+ # Drizzle is different than MySQL in displaying timestamps
9+ # ["TIMESTAMPADD","timestampadd",
10+ # "timestampadd(SQL_TSI_SECOND,1,'1997-01-01 00:00:00')",
11+ # "1997-01-01 00:00:01",1],
12 ["TIMESTAMPADD","timestampadd",
13 "timestampadd(SQL_TSI_SECOND,1,'1997-01-01 00:00:00')",
14- "1997-01-01 00:00:01",1],
15+ "1997-01-01 00:00:01.000000",1],
16 ["TIMESTAMPDIFF","timestampdiff",
17 "timestampdiff(SQL_TSI_SECOND,'1997-01-01 00:00:01',".
18 " '1997-01-01 00:00:02')","1",0],
19@@ -1568,8 +1572,12 @@
20 "CHAR(a,EUR)",'16.08.1963',0],
21 ["MAKEDATE",'makedate',"MAKEDATE(1963,228)"
22 ,'make_date_r(1963,08,16)',0],
23+ # Drizzle is different than MySQL in handling TO_DAYS
24+ # Drizzle calculates the Julian Day Number
25+ # ["TO_DAYS","to_days",
26+ # "to_days(make_date(1996,01,01))",729024,0],
27 ["TO_DAYS","to_days",
28- "to_days(make_date(1996,01,01))",729024,0],
29+ "to_days(make_date(1996,01,01))",2450084,0],
30 ["ADD_MONTHS","add_months",
31 "add_months(make_date(1997,01,01),1)","make_date_r(1997,02,01)",0],
32 # oracle the date plus n months