Drizzle

Merge lp://qastaging/~brianaker/drizzle/regression-622465 into lp://qastaging/drizzle/7.0

regression-622465
Merge into 7.0

Proposed by Brian Aker on 2011-01-14

Status:

Merged

Approved by:

Brian Aker on 2011-01-14

Approved revision:

2081

Merged at revision:

2093

Proposed branch:

lp://qastaging/~brianaker/drizzle/regression-622465

Merge into:

lp://qastaging/drizzle/7.0

Diff against target:

402 lines (+120/-77) (has conflicts)

10 files modified

drizzled/cursor.h (+5/-5)
drizzled/error.cc (+1/-0)
drizzled/error_t.h (+11/-0)
drizzled/sql_table.cc (+59/-59)
drizzled/sql_table.h (+3/-3)
drizzled/statement/create_table.cc (+4/-3)
tests/r/create.result (+5/-5)
tests/suite/regression/r/622465.result (+12/-0)
tests/suite/regression/t/622465.test (+10/-0)
tests/t/create.test (+10/-2)

Text conflict in drizzled/error_t.h

To merge this branch:

bzr merge lp://qastaging/~brianaker/drizzle/regression-622465

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lee Bieber (community)		2011-01-14	Needs Fixing on 2011-01-14
Review via email: mp+46217@code.qastaging.launchpad.net

Description of the change

We need to modify the names of the FK toward the name of the new table.

Revision history for this message

Lee Bieber (kalebral-deactivatedaccount) wrote on 2011-01-14:

Getting test failures - regression.592690 microtime_type.decimal microtime_type.max

--- .././tests/suite/microtime_type/r/decimal.result 2011-01-14 05:58:28.446261000 +0300
+++ .././tests/suite/microtime_type/r/decimal.reject 2011-01-14 21:34:44.103791539 +0300
@@ -14,6 +14,6 @@
SELECT _value FROM t2;
_value
2003-01-01 00:00:00.000000
-2003-01-01 00:00:00.125000
-2003-01-01 00:00:00.898437
+2003-01-01 00:00:00.123456
+2003-01-01 00:00:00.900000
DROP TABLE t1,t2;

microtime_type.max [ fail ]
drizzletest: At line 6: query 'INSERT into t2 VALUES ("20660101000000.00000")' failed: 1685: Received an invalid value '20660101000000.00000' for a UNIX timestamp.

The result from queries just before the failure was:
CREATE TABLE t2 (
_value TIMESTAMP(6)
);
INSERT into t2 VALUES ("20660101000000.00000");

mysql_compatibility.zerofill [ pass ] 2
regression.592690 [ fail ]
--- .././tests/suite/regression/r/592690.result 2011-01-14 05:58:28.446261000 +0300
+++ .././tests/suite/regression/r/592690.reject 2011-01-14 21:34:30.083175783 +0300
@@ -1,3 +1,5 @@
select from_unixtime(1272945599.90000), from_unixtime(1272945599), from_unixtime("1272945599.90000");
from_unixtime(1272945599.90000) from_unixtime(1272945599) from_unixtime("1272945599.90000")
-2010-05-04 03:59:59.900000 2010-05-04 03:59:59 2010-05-04 03:59:59.900000
+2010-05-04 04:00:00 2010-05-04 03:59:59 2010-05-04 03:59:59
+Warnings:
+Warning 1292 Truncated incorrect INTEGER value: '1272945599.90000'

microtime_type.decimal [ fail ]
--- .././tests/suite/microtime_type/r/decimal.result 2011-01-14 05:58:28.446261000 +0300
+++ .././tests/suite/microtime_type/r/decimal.reject 2011-01-14 21:34:44.103791539 +0300
@@ -14,6 +14,6 @@
SELECT _value FROM t2;
_value
2003-01-01 00:00:00.000000
-2003-01-01 00:00:00.125000
-2003-01-01 00:00:00.898437
+2003-01-01 00:00:00.123456
+2003-01-01 00:00:00.900000
DROP TABLE t1,t2;

Getting test failures - regression.592690 microtime_type.decimal microtime_type.max

--- .././tests/suite/microtime_type/r/decimal.result	2011-01-14 05:58:28.446261000 +0300
+++ .././tests/suite/microtime_type/r/decimal.reject	2011-01-14 21:34:44.103791539 +0300
@@ -14,6 +14,6 @@
 SELECT _value FROM t2;
 _value
 2003-01-01 00:00:00.000000
-2003-01-01 00:00:00.125000
-2003-01-01 00:00:00.898437
+2003-01-01 00:00:00.123456
+2003-01-01 00:00:00.900000
 DROP TABLE t1,t2;

microtime_type.max                                           [ fail ]
drizzletest: At line 6: query 'INSERT into t2 VALUES ("20660101000000.00000")' failed: 1685: Received an invalid value '20660101000000.00000' for a UNIX timestamp.

The result from queries just before the failure was:
CREATE TABLE t2 (
_value TIMESTAMP(6)
);
INSERT into t2 VALUES ("20660101000000.00000");

mysql_compatibility.zerofill                                 [ pass ]       2
regression.592690                                            [ fail ]
--- .././tests/suite/regression/r/592690.result	2011-01-14 05:58:28.446261000 +0300
+++ .././tests/suite/regression/r/592690.reject	2011-01-14 21:34:30.083175783 +0300
@@ -1,3 +1,5 @@
 select from_unixtime(1272945599.90000), from_unixtime(1272945599), from_unixtime("1272945599.90000");
 from_unixtime(1272945599.90000)	from_unixtime(1272945599)	from_unixtime("1272945599.90000")
-2010-05-04 03:59:59.900000	2010-05-04 03:59:59	2010-05-04 03:59:59.900000
+2010-05-04 04:00:00	2010-05-04 03:59:59	2010-05-04 03:59:59
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '1272945599.90000'

microtime_type.decimal                                       [ fail ]
--- .././tests/suite/microtime_type/r/decimal.result	2011-01-14 05:58:28.446261000 +0300
+++ .././tests/suite/microtime_type/r/decimal.reject	2011-01-14 21:34:44.103791539 +0300
@@ -14,6 +14,6 @@
 SELECT _value FROM t2;
 _value
 2003-01-01 00:00:00.000000
-2003-01-01 00:00:00.125000
-2003-01-01 00:00:00.898437
+2003-01-01 00:00:00.123456
+2003-01-01 00:00:00.900000
 DROP TABLE t1,t2;

review: Needs Fixing