Hosting Provided By

bk commit into 6.0 tree (hakank:1.2623)

From: Hakan Kuecuekyilmaz <hakan(at)mysql.com>
Date: Fri Oct 05 2007 - 08:21:38 EDT

Below is the list of changes that have just been committed into a local 6.0 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@1.2623, 2007-10-05 14:21:31+02:00, hakank@lu0011.(none) +16 -0 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_22143.test@1.3, 2007-10-05 14:21:26+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_22151.test@1.3, 2007-10-05 14:21:26+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_22161.test@1.3, 2007-10-05 14:21:26+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_22178.test@1.4, 2007-10-05 14:21:26+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_22183.test@1.3, 2007-10-05 14:21:26+02:00, hakank@lu0011.(none) +2 -2 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_22842.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

Do you need help?

mysql-test/suite/falcon/t/falcon_bug_22845.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_23816.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_27997.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +2 -2 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_28026.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_29332.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +2 -2 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bug_30210.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bugs.test@1.2, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_bugs2.test@1.2, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

Do you need more help?

mysql-test/suite/falcon/t/falcon_select.test@1.2, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +18 -18 Use error constants instead of error numbers.

mysql-test/suite/falcon/t/falcon_select_for_update.test@1.3, 2007-10-05 14:21:27+02:00, hakank@lu0011.(none) +1 -1 Use error constants instead of error numbers.

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22143.test b/mysql-test/suite/falcon/t/falcon_bug_22143.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22143.test	2007-09-29 06:30:36 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22143.test	2007-10-05 14:21:26 +02:00
@@ -23,7 +23,7 @@ INSERT INTO t1 VALUES (3), (0), (3);

SELECT count(*) FROM t1;

 # Run this with --tmpdir=/tmp to crash Falcon change set 1.2282, 2006-09-05 
-#--error 1005
+#--error ER_CANT_CREATE_TABLE
 #CREATE TEMPORARY TABLE t1 (a int, b int);
 # End run this
 
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22151.test b/mysql-test/suite/falcon/t/falcon_bug_22151.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22151.test	2007-09-29 06:30:36 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22151.test	2007-10-05 14:21:26 +02:00

@@ -45,7 +45,7 @@ ROLLBACK;
connection conn1;
reap;
INSERT INTO t1 VALUES (0,6);
---error 1062

+--error ER_DUP_ENTRY
INSERT INTO t1 VALUES (0,6);
COMMIT;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22161.test b/mysql-test/suite/falcon/t/falcon_bug_22161.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22161.test	2007-09-29 06:30:36 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22161.test	2007-10-05 14:21:26 +02:00
@@ -12,7 +12,7 @@ CREATE TABLE t1 (a text);

INSERT INTO t1 VALUES (repeat('a',16384)); ALTER TABLE t1 MODIFY COLUMN a varchar(30000); ALTER TABLE t1 MODIFY COLUMN a text;
--- error 1073

+--error ER_BLOB_USED_AS_KEY
CREATE INDEX i1 ON t1 (a);
ALTER TABLE t1 MODIFY COLUMN a varchar(30000); CREATE INDEX i1 ON t1 (a);

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22178.test b/mysql-test/suite/falcon/t/falcon_bug_22178.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22178.test	2007-10-05 08:42:50 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22178.test	2007-10-05 14:21:26 +02:00
@@ -10,7 +10,7 @@ SET STORAGE_ENGINE='Falcon';

DROP TABLE IF EXISTS t18;
--enable_warnings

---error 1563

+--error ER_PARTITION_FUNCTION_IS_NOT_ALLOWED CREATE TABLE t18 (
s1 char(5),
PRIMARY KEY (s1)

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22183.test b/mysql-test/suite/falcon/t/falcon_bug_22183.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22183.test	2007-09-29 06:30:36 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22183.test	2007-10-05 14:21:26 +02:00
@@ -21,7 +21,7 @@ USE falcon6;
 # ALTER TABLE on table with pending transactions

# does not work with Falcon. However, the error message # is misleading.
---error 1015

+--error ER_CANT_LOCK
ALTER TABLE t DROP PRIMARY KEY;
SET @@autocommit = 0;
START TRANSACTION;
@@ -31,7 +31,7 @@ START TRANSACTION;
connection default;
# We get a "multiple primary key defined", as the previous # DROP PRIMARY KEY did not worked.
---error 1068

+--error ER_MULTIPLE_PRI_KEY
ALTER TABLE t ADD PRIMARY KEY (s1);
COMMIT;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22842.test b/mysql-test/suite/falcon/t/falcon_bug_22842.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22842.test	2007-09-29 06:30:37 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22842.test	2007-10-05 14:21:27 +02:00
@@ -30,7 +30,7 @@ INSERT INTO t1 VALUES (1,2);

--echo # Switch to connection default
connection default;
---error 1015

+--error ER_CANT_LOCK
CREATE UNIQUE INDEX i ON t1 (s1);
COMMIT;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22845.test b/mysql-test/suite/falcon/t/falcon_bug_22845.test

--- a/mysql-test/suite/falcon/t/falcon_bug_22845.test	2007-09-29 06:30:37 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_22845.test	2007-10-05 14:21:27 +02:00
Can we help you? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
@@ -35,7 +35,7 @@ INSERT INTO t1 VALUES (2);

--echo # Switch to connection default
connection default;
---error 1296

+--error ER_GET_ERRMSG
ALTER TABLE t1 DROP PARTITION p2;

--echo # Switch to connection conn1

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_23816.test b/mysql-test/suite/falcon/t/falcon_bug_23816.test

--- a/mysql-test/suite/falcon/t/falcon_bug_23816.test	2007-09-29 06:30:37 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_23816.test	2007-10-05 14:21:27 +02:00
@@ -35,7 +35,7 @@ COMMIT;

--echo # Switch to connection conn1
connection conn1;
---error 1015

+--error ER_CANT_LOCK
--reap
COMMIT;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_27997.test b/mysql-test/suite/falcon/t/falcon_bug_27997.test

--- a/mysql-test/suite/falcon/t/falcon_bug_27997.test	2007-09-29 06:30:37 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_27997.test	2007-10-05 14:21:27 +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 1582

+--error ER_WRONG_PARAMETERS_TO_NATIVE_FCT UPDATE t1 SET b = 2;
COMMIT;
---error 1582

+--error ER_WRONG_PARAMETERS_TO_NATIVE_FCT UPDATE t1 SET b = 2;
COMMIT;
UPDATE t1 SET a = 3, b = 2 WHERE a = 5 LIMIT 1;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_28026.test b/mysql-test/suite/falcon/t/falcon_bug_28026.test

--- a/mysql-test/suite/falcon/t/falcon_bug_28026.test	2007-09-29 06:30:37 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_28026.test	2007-10-05 14:21:27 +02:00
@@ -47,7 +47,7 @@ connection default;

--echo # Switch to connection conn1
connection conn1;

 --real_sleep 1

---error 1213

+--error ER_LOCK_DEADLOCK
SELECT * FROM t1 WHERE a = 8 FOR UPDATE; ROLLBACK;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_29332.test b/mysql-test/suite/falcon/t/falcon_bug_29332.test

--- a/mysql-test/suite/falcon/t/falcon_bug_29332.test	2007-09-29 06:30:38 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_29332.test	2007-10-05 14:21:27 +02:00
@@ -44,7 +44,7 @@ connection default;

# This select should fail immediately with a deadlock since the other # transaction is already wating on this.

 --real_sleep 1

---error 1213

+--error ER_LOCK_DEADLOCK
SELECT * FROM t1 WHERE a = 9 FOR UPDATE; # Innodb automatically does a rollback. Falcon does not. SELECT * FROM t1 ORDER BY a;
@@ -96,7 +96,7 @@ connection default;
# This select should fail immediately with a deadlock since the other # transaction is already wating on this.

 --real_sleep 1

---error 1213

+--error ER_LOCK_DEADLOCK
SELECT * FROM t2 WHERE a = 9 FOR UPDATE; # Innodb automatically does a rollback. Falcon does not. SELECT * FROM t2 ORDER BY a;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_30210.test b/mysql-test/suite/falcon/t/falcon_bug_30210.test

--- a/mysql-test/suite/falcon/t/falcon_bug_30210.test	2007-09-29 06:30:38 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bug_30210.test	2007-10-05 14:21:27 +02:00
@@ -26,7 +26,7 @@ CREATE TABLE T (a int);
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #

---error 1050, 1005

+--error ER_TABLE_EXISTS_ERROR, ER_CANT_CREATE_TABLE CREATE TABLE t (a int);
INSERT INTO T VALUES (1);

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bugs.test b/mysql-test/suite/falcon/t/falcon_bugs.test

--- a/mysql-test/suite/falcon/t/falcon_bugs.test	2007-09-20 17:43:43 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bugs.test	2007-10-05 14:21:27 +02:00
@@ -1632,7 +1632,7 @@ INSERT INTO t1 VALUES (9,2,2),(24,4,2);
Can't find what you're looking for? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek

--echo # This UPDATE gets a crash
update t1 set parent_id=parent_id+100;

error ER_DUP_ENTRY,1022 +--error ER_DUP_ENTRY, ER_DUP_KEY update t1 set id=24 where id=9;

# Is the server alive ?

diff -Nrup a/mysql-test/suite/falcon/t/falcon_bugs2.test b/mysql-test/suite/falcon/t/falcon_bugs2.test

--- a/mysql-test/suite/falcon/t/falcon_bugs2.test	2007-09-20 17:43:43 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_bugs2.test	2007-10-05 14:21:27 +02:00
@@ -86,7 +86,7 @@ INSERT INTO t1 VALUES (1, 'foo');

COMMIT;
INSERT INTO t1 VALUES (2, 'oma');
COMMIT;
---error ER_DUP_ENTRY,1022

+--error ER_DUP_ENTRY, ER_DUP_KEY
INSERT INTO t1 VALUES (2, 'opa');
COMMIT;
SELECT * FROM t1;

diff -Nrup a/mysql-test/suite/falcon/t/falcon_select.test b/mysql-test/suite/falcon/t/falcon_select.test

--- a/mysql-test/suite/falcon/t/falcon_select.test	2007-09-20 17:43:45 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_select.test	2007-10-05 14:21:27 +02:00
@@ -1302,9 +1302,9 @@ explain select fld3 from t2 use index (f

# The next should give an error
#

error ER_KEY_DOES_NOT_EXITS +--error ER_KEY_DOES_NOT_EXITS explain select fld3 from t2 ignore index (fld3,not_used);
error ER_KEY_DOES_NOT_EXITS +--error ER_KEY_DOES_NOT_EXITS explain select fld3 from t2 use index (not_used);

Don't know where to look next?

#
@@ -2010,9 +2010,9 @@ drop table t1;
create table t1 (a int(11));
select all all * from t1;
select distinct distinct * from t1;
---error 1221

+--error ER_WRONG_USAGE
select all distinct * from t1;
---error 1221

+--error ER_WRONG_USAGE
select distinct all * from t1;
drop table t1;

@@ -2309,9 +2309,9 @@ drop table t1;
create table t1 (a int(11));
select all all * from t1;
select distinct distinct * from t1;
---error 1221

+--error ER_WRONG_USAGE
select all distinct * from t1;
---error 1221

+--error ER_WRONG_USAGE
select distinct all * from t1;
drop table t1;

@@ -2393,9 +2393,9 @@ drop table t1;
create table t1 (a int(11));
select all all * from t1;
select distinct distinct * from t1;
---error 1221

+--error ER_WRONG_USAGE
select all distinct * from t1;
---error 1221

+--error ER_WRONG_USAGE
select distinct all * from t1;
drop table t1;

@@ -2523,7 +2523,7 @@ CREATE TABLE BUG_12595(a varchar(100));

 INSERT INTO BUG_12595 VALUES ('hakan%'), ('hakank'), ("ha%an");
 SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%';
 SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';

--- error 1210

+--error ER_WRONG_ARGUMENTS
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan**%' ESCAPE '**'; # this should work when sql_mode is not NO_BACKSLASH_ESCAPES SELECT * FROM BUG_12595 WHERE a LIKE 'hakan%' ESCAPE ''; @@ -2537,16 +2537,16 @@ SET @@SQL_MODE='NO_BACKSLASH_ESCAPES'; SHOW LOCAL VARIABLES LIKE 'SQL_MODE';
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%'; SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';
--- error 1210

+--error ER_WRONG_ARGUMENTS
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan**%' ESCAPE '**';
--- error 1210

+--error ER_WRONG_ARGUMENTS
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%' ESCAPE '\\'; #this gives an error when NO_BACKSLASH_ESCAPES is set
--- error 1210

+--error ER_WRONG_ARGUMENTS

 SELECT * FROM BUG_12595 WHERE a LIKE 'hakan%' ESCAPE '';
 SELECT * FROM BUG_12595 WHERE a LIKE 'ha\%an' ESCAPE 0x5c;
 SELECT * FROM BUG_12595 WHERE a LIKE 'ha|%an' ESCAPE '|';

--- error 1210

+--error ER_WRONG_ARGUMENTS
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\n%' ESCAPE '\n';

SET @@SQL_MODE=@OLD_SQL_MODE12595;
@@ -2575,13 +2575,13 @@ CREATE TABLE t3 (`id` TINYINT);

 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t2 VALUES (2);
 INSERT INTO t3 VALUES (3);

--- error 1052

+--error ER_NON_UNIQ_ERROR
SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
--- error 1052

+--error ER_NON_UNIQ_ERROR
SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.notacolumn=t1.id) LEFT JOIN t3 USING (id);
--- error 1052

+--error ER_NON_UNIQ_ERROR
SELECT id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
--- error 1052

+--error ER_NON_UNIQ_ERROR
SELECT id,t3.id FROM (t1 JOIN t2 ON (t2.id=t1.id)) LEFT JOIN t3 USING (id);

drop table t1, t2, t3;
@@ -2616,7 +2616,7 @@ insert into t4 values (1); select * from t1 join t2 join t3 on (t2.b = t3.b and t1.a = t3.a); # Notice that ',' has lower priority than 'join', thus we have that: # t1, t2 join t3 <==> t1, (t2 join t3).
--- error 1054

+--error ER_BAD_FIELD_ERROR

 select * from t1, t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
 select * from t1 join t2 join t3 join t4 on (t1.a = t4.c and t2.b = t4.c);
 select * from t1 join t2 join t4 using (c);
diff -Nrup a/mysql-test/suite/falcon/t/falcon_select_for_update.test b/mysql-test/suite/falcon/t/falcon_select_for_update.test

--- a/mysql-test/suite/falcon/t/falcon_select_for_update.test	2007-09-29 06:30:38 +02:00

+++ b/mysql-test/suite/falcon/t/falcon_select_for_update.test	2007-10-05 14:21:27 +02:00

@@ -45,7 +45,7 @@ connection default;
connection conn1;
# This statement should fail with a deadlock.

 --real_sleep 1

---error 1213

+--error ER_LOCK_DEADLOCK
SELECT a FROM t1 WHERE a = 1 FOR UPDATE; ROLLBACK;

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Fri Oct 5 08:21:50 2007

This message: [ Message body ]
Next message: ahristov(at)mysql.com: "PHP mysqlnd svn commit: r1086 - trunk/php5/ext/mysqli"
Previous message: jmiller(at)mysql.com: "bk commit into 5.1 tree (jmiller:1.2646)"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Sun Oct 07 2007 - 09:58:08 EDT