Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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, 2007-08-31 10:20:57+02:00, hakank@stripped +12 -0
Error numbers changed again ...
mysql-test/t/falcon_bug_22174.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +2 -2
Error numbers changed again ...
mysql-test/t/falcon_bug_22180.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_22183.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_22847.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_26802.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_26803.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +4 -4
Error numbers changed again ...
mysql-test/t/falcon_bug_28046.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_28048.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +2 -2
Error numbers changed again ...
mysql-test/t/falcon_bug_28165.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_28500.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_29240.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +1 -1
Error numbers changed again ...
mysql-test/t/falcon_bug_30031.test@stripped, 2007-08-31 10:20:55+02:00, hakank@stripped +2 -2
Error numbers changed again ...
diff -Nrup a/mysql-test/t/falcon_bug_22174.test b/mysql-test/t/falcon_bug_22174.test
--- a/mysql-test/t/falcon_bug_22174.test 2007-03-28 18:10:54 +02:00
+++ b/mysql-test/t/falcon_bug_22174.test 2007-08-31 10:20:55 +02:00
@@ -15,7 +15,7 @@ DROP TABLE IF EXISTS t1;
create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3));
insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
LOCK TABLES t1 WRITE;
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
insert into t1 values (99,1,2,'D'),(1,1,2,'D');
select id from t1 ORDER BY id, id2;
UNLOCK TABLES;
@@ -23,7 +23,7 @@ DROP TABLE t1;
create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3));
insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
LOCK TABLES t1 WRITE;
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
insert into t1 values (99,1,2,'D'),(1,1,2,'D');
select id from t1 ORDER BY id, id2;
UNLOCK TABLES;
diff -Nrup a/mysql-test/t/falcon_bug_22180.test b/mysql-test/t/falcon_bug_22180.test
--- a/mysql-test/t/falcon_bug_22180.test 2007-03-28 18:10:54 +02:00
+++ b/mysql-test/t/falcon_bug_22180.test 2007-08-31 10:20:55 +02:00
@@ -30,7 +30,7 @@ SELECT * FROM t2 WHERE a = '_';
SELECT * FROM t2 WHERE a LIKE '_';
INSERT INTO t3 VALUES ('I');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
INSERT INTO t3 VALUES ('i');
# Final cleanup.
diff -Nrup a/mysql-test/t/falcon_bug_22183.test b/mysql-test/t/falcon_bug_22183.test
--- a/mysql-test/t/falcon_bug_22183.test 2007-03-28 18:10:54 +02:00
+++ b/mysql-test/t/falcon_bug_22183.test 2007-08-31 10:20:55 +02:00
@@ -36,7 +36,7 @@ COMMIT;
--echo # Switch to connection conn1
connection conn1;
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
--reap
COMMIT;
ALTER TABLE t DROP PRIMARY KEY;
diff -Nrup a/mysql-test/t/falcon_bug_22847.test b/mysql-test/t/falcon_bug_22847.test
--- a/mysql-test/t/falcon_bug_22847.test 2007-05-16 16:13:59 +02:00
+++ b/mysql-test/t/falcon_bug_22847.test 2007-08-31 10:20:55 +02:00
@@ -48,7 +48,7 @@ UPDATE t1 SET a = 4 where a = 3;
--echo # Switch to connection default
connection default;
SELECT * FROM t1;
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES (2);
INSERT INTO t1 VALUES (3);
SELECT * FROM t1;
diff -Nrup a/mysql-test/t/falcon_bug_26802.test b/mysql-test/t/falcon_bug_26802.test
--- a/mysql-test/t/falcon_bug_26802.test 2007-03-02 20:52:02 +01:00
+++ b/mysql-test/t/falcon_bug_26802.test 2007-08-31 10:20:55 +02:00
@@ -11,7 +11,7 @@ CREATE TABLE t1 (a int unsigned);
INSERT INTO t1 VALUES (4294967295), (4294967294);
CREATE UNIQUE INDEX i1 ON t1 (a);
---error 1582
+--error ER_DUP_ENTRY
UPDATE t1 SET a = a + 1;
SELECT * FROM t1 ORDER BY a;
diff -Nrup a/mysql-test/t/falcon_bug_26803.test b/mysql-test/t/falcon_bug_26803.test
--- a/mysql-test/t/falcon_bug_26803.test 2007-04-07 16:54:28 +02:00
+++ b/mysql-test/t/falcon_bug_26803.test 2007-08-31 10:20:55 +02:00
@@ -23,13 +23,13 @@ INSERT INTO t1 VALUES ('y', 'y');
# ----------------------------------------------------- #
# --- Test --- #
# ----------------------------------------------------- #
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES ('y', 'y');
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES ('y ', 'y');
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES ('y', 'y ');
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES ('y ', 'y ');
# ----------------------------------------------------- #
diff -Nrup a/mysql-test/t/falcon_bug_28046.test b/mysql-test/t/falcon_bug_28046.test
--- a/mysql-test/t/falcon_bug_28046.test 2007-04-24 02:18:24 +02:00
+++ b/mysql-test/t/falcon_bug_28046.test 2007-08-31 10:20:55 +02:00
@@ -49,7 +49,7 @@ INSERT INTO t1 VALUES (9,2,2),(24,4,2);
--echo # This UPDATE gets a crash
update t1 set parent_id=parent_id+100;
---error ER_DUP_ENTRY_WITH_KEY_NAME,1022
+--error ER_DUP_ENTRY,1022
update t1 set id=24 where id=9;
# Is the server alive ?
diff -Nrup a/mysql-test/t/falcon_bug_28048.test b/mysql-test/t/falcon_bug_28048.test
--- a/mysql-test/t/falcon_bug_28048.test 2007-04-24 02:18:24 +02:00
+++ b/mysql-test/t/falcon_bug_28048.test 2007-08-31 10:20:55 +02:00
@@ -28,13 +28,13 @@ commit;
select n, "after commit" from t1;
commit;
insert into t1 values (5);
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
insert into t1 values (4);
commit;
select n, "after commit" from t1;
set autocommit=1;
insert into t1 values (6);
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
insert into t1 values (4);
select n from t1;
set autocommit=0;
diff -Nrup a/mysql-test/t/falcon_bug_28165.test b/mysql-test/t/falcon_bug_28165.test
--- a/mysql-test/t/falcon_bug_28165.test 2007-04-30 22:17:25 +02:00
+++ b/mysql-test/t/falcon_bug_28165.test 2007-08-31 10:20:55 +02:00
@@ -23,7 +23,7 @@ COMMIT;
# --- Test --- #
# ----------------------------------------------------- #
SELECT * FROM t1 FOR UPDATE;
---error 1582
+--error ER_DUP_ENTRY
UPDATE t1 SET b = 2;
UPDATE t1 SET b = 2 LIMIT 1;
ROLLBACK;
diff -Nrup a/mysql-test/t/falcon_bug_28500.test b/mysql-test/t/falcon_bug_28500.test
--- a/mysql-test/t/falcon_bug_28500.test 2007-05-20 14:00:19 +02:00
+++ b/mysql-test/t/falcon_bug_28500.test 2007-08-31 10:20:55 +02:00
@@ -23,7 +23,7 @@ INSERT INTO t1 VALUES ('1234');
# ----------------------------------------------------- #
# --- Test --- #
# ----------------------------------------------------- #
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES ('12345');
# ----------------------------------------------------- #
diff -Nrup a/mysql-test/t/falcon_bug_29240.test b/mysql-test/t/falcon_bug_29240.test
--- a/mysql-test/t/falcon_bug_29240.test 2007-07-26 14:30:01 +02:00
+++ b/mysql-test/t/falcon_bug_29240.test 2007-08-31 10:20:55 +02:00
@@ -30,7 +30,7 @@ SET @@autocommit = 0;
--echo # Switch to connection default
connection default;
---error 1582
+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES (1);
DELETE FROM t1;
COMMIT;
diff -Nrup a/mysql-test/t/falcon_bug_30031.test b/mysql-test/t/falcon_bug_30031.test
--- a/mysql-test/t/falcon_bug_30031.test 2007-08-24 07:25:27 +02:00
+++ b/mysql-test/t/falcon_bug_30031.test 2007-08-31 10:20:55 +02:00
@@ -55,13 +55,13 @@ COMMIT;
# Connection #1
connection con1;
---error 1582
+--error ER_DUP_ENTRY
reap;
SELECT * from t1;
# Connection #2
connection con2;
---error 1582
+--error ER_DUP_ENTRY
reap;
SELECT * from t1;
| Thread |
|---|
| • bk commit into 6.0-falcon tree (hakank:1.2580) | Hakan Kuecuekyilmaz | 31 Aug |
