Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub. When vvaintroub does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-23 10:50:47+02:00, vvaintroub@wva. +3 -0
Cleanup test suite.
-Adjusted result in ps_8falcon, as floating point formatting has been
changed meanwhile. results are checked against MyISAM
-Fixed falcon_bug_27997 - was checking for wrong error code
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result@stripped, 2008-04-23 10:50:40+02:00, vvaintroub@wva. +1 -0
Result file was missing final DROP table
mysql-test/suite/falcon_team/r/ps_8falcon.result@stripped, 2008-04-23 10:50:40+02:00, vvaintroub@wva. +40 -41
Wrong result file , floating point formatting has been changed
mysql-test/suite/falcon_team/t/falcon_bug_27997.test@stripped, 2008-04-23 10:50:41+02:00, vvaintroub@wva. +2 -2
Correct test (check wrong error code)
diff -Nrup a/mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result b/mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result 2008-04-20 01:07:39 +02:00
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result 2008-04-23 10:50:40 +02:00
@@ -26,3 +26,4 @@ AA 4141
SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'A%';
s1 HEX(s1)
AA 4141
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon_team/r/ps_8falcon.result b/mysql-test/suite/falcon_team/r/ps_8falcon.result
--- a/mysql-test/suite/falcon_team/r/ps_8falcon.result 2008-04-20 01:07:39 +02:00
+++ b/mysql-test/suite/falcon_team/r/ps_8falcon.result 2008-04-23 10:50:40 +02:00
@@ -1158,7 +1158,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
-def key_len 253 1365 0 Y 0 31 8
+def key_len 253 320 0 Y 0 31 8
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8
@@ -1286,12 +1286,11 @@ a b
set @arg00=NULL;
set @arg01=2;
execute stmt1 using @arg00, @arg01;
-Warnings:
-Warning 1048 Column 'a' cannot be null
+ERROR 23000: Column 'a' cannot be null
select a,b from t1 order by a;
a b
-0 two
1 one
+2 two
3 three
4 four
set @arg00=0;
@@ -2568,10 +2567,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -2591,10 +2590,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -2614,10 +2613,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -2637,10 +2636,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -2662,10 +2661,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -2687,10 +2686,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -2712,10 +2711,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -2737,10 +2736,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -2805,10 +2804,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
-54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00
-55 5 55 55 55 55 55 55 55 55 55 55
-56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00
-57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00
+54 5 54 54 54 54 54 54 54 54 54 54
+55 6 55 55 55 55 55 55 55 55 55 55
+56 6 56 56 56 56 56 56 56 56 56 56
+57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -3022,7 +3021,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
diff -Nrup a/mysql-test/suite/falcon_team/t/falcon_bug_27997.test b/mysql-test/suite/falcon_team/t/falcon_bug_27997.test
--- a/mysql-test/suite/falcon_team/t/falcon_bug_27997.test 2008-04-20 01:03:55 +02:00
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_27997.test 2008-04-23 10:50:41 +02:00
@@ -24,10 +24,10 @@ CREATE UNIQUE INDEX i1 on t1 (a, b);
INSERT INTO t1 VALUES (5, NULL), (5, NULL);
COMMIT;
SELECT * FROM t1 FOR UPDATE;
---error ER_WRONG_PARAMETERS_TO_NATIVE_FCT
+--error ER_DUP_ENTRY
UPDATE t1 SET b = 2;
COMMIT;
---error ER_WRONG_PARAMETERS_TO_NATIVE_FCT
+--error ER_DUP_ENTRY
UPDATE t1 SET b = 2;
COMMIT;
UPDATE t1 SET a = 3, b = 2 WHERE a = 5 LIMIT 1;
| Thread |
|---|
| • bk commit into 6.0 tree (vvaintroub:1.2640) | vvaintroub | 23 Apr |
