Below is the list of changes that have just been committed into a local
4.1 repository of greenman. When greenman 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, 2006-08-04 05:29:12-07:00, igreenhoe@stripped +4 -0
Fix for bug #21123 (Test "func_misc" is not sutable for "embedded"
runs)
Problem: Test caused a deadlock in the embedded server. Deadlock
cannot be practically resolved (it would require true multithreading
in mysqltest_embedded).
Solution: Split the test into two tests. One test is appropriate
for running with embedded, the other is not.
mysql-test/r/func_misc.result@stripped, 2006-08-04 05:29:10-07:00, igreenhoe@stripped +0 -36
Moved the portion of the test that deadlocked mysqltest_embedded to
a seperate test.
mysql-test/r/func_misc_notembedded.result@stripped, 2006-08-04 05:29:10-07:00, igreenhoe@stripped +36 -0
Moved the portion of the test that deadlocked mysqltest_embedded to
a seperate test.
mysql-test/r/func_misc_notembedded.result@stripped, 2006-08-04 05:29:10-07:00, igreenhoe@stripped +0 -0
mysql-test/t/func_misc.test@stripped, 2006-08-04 05:29:10-07:00, igreenhoe@stripped +0 -40
Moved the portion of the test that deadlocked mysqltest_embedded to
a seperate test.
mysql-test/t/func_misc_notembedded.test@stripped, 2006-08-04 05:29:10-07:00, igreenhoe@stripped +47 -0
Moved the portion of the test that deadlocked mysqltest_embedded to
a seperate test.
mysql-test/t/func_misc_notembedded.test@stripped, 2006-08-04 05:29:10-07:00, igreenhoe@stripped +0 -0
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: igreenhoe
# Host: anubis.greendragongames.com
# Root: /home/greenman/workspace-mysql/mysql/bug-4.1-21123
--- New file ---
+++ mysql-test/r/func_misc_notembedded.result 06/08/04 05:29:10
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (conn CHAR(7), connection_id INT);
INSERT INTO t1 VALUES ('default', CONNECTION_ID());
SELECT GET_LOCK('bug16501',600);
GET_LOCK('bug16501',600)
1
INSERT INTO t1 VALUES ('con1', CONNECTION_ID());
SELECT IS_USED_LOCK('bug16501') = connection_id
FROM t1
WHERE conn = 'default';
IS_USED_LOCK('bug16501') = connection_id
1
SELECT GET_LOCK('bug16501',600);
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
IS_USED_LOCK('bug16501') = CONNECTION_ID()
1
SELECT RELEASE_LOCK('bug16501');
RELEASE_LOCK('bug16501')
1
GET_LOCK('bug16501',600)
1
SELECT IS_USED_LOCK('bug16501') = connection_id
FROM t1
WHERE conn = 'con1';
IS_USED_LOCK('bug16501') = connection_id
1
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
IS_USED_LOCK('bug16501') = CONNECTION_ID()
1
SELECT RELEASE_LOCK('bug16501');
RELEASE_LOCK('bug16501')
1
SELECT IS_USED_LOCK('bug16501');
IS_USED_LOCK('bug16501')
NULL
DROP TABLE t1;
--- New file ---
+++ mysql-test/t/func_misc_notembedded.test 06/08/04 05:29:10
#
# Testing of misc functions
#
# This file is only for tests that cannot succeed on embedded.
# (See bug #21123 -- func_misc not suitable for embedded runs).
#
# Bug#16501: IS_USED_LOCK does not appear to work
#
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
CREATE TABLE t1 (conn CHAR(7), connection_id INT);
INSERT INTO t1 VALUES ('default', CONNECTION_ID());
SELECT GET_LOCK('bug16501',600);
connect (con1,localhost,root,,);
INSERT INTO t1 VALUES ('con1', CONNECTION_ID());
SELECT IS_USED_LOCK('bug16501') = connection_id
FROM t1
WHERE conn = 'default';
send SELECT GET_LOCK('bug16501',600);
connection default;
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
SELECT RELEASE_LOCK('bug16501');
connection con1;
reap;
connection default;
SELECT IS_USED_LOCK('bug16501') = connection_id
FROM t1
WHERE conn = 'con1';
connection con1;
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
SELECT RELEASE_LOCK('bug16501');
SELECT IS_USED_LOCK('bug16501');
disconnect con1;
connection default;
DROP TABLE t1;
# End of 4.1 tests
--- 1.19/mysql-test/r/func_misc.result 2006-08-04 05:29:16 -07:00
+++ 1.20/mysql-test/r/func_misc.result 2006-08-04 05:29:16 -07:00
@@ -57,39 +57,3 @@
`length(uuid())` int(10) NOT NULL default '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (conn CHAR(7), connection_id INT);
-INSERT INTO t1 VALUES ('default', CONNECTION_ID());
-SELECT GET_LOCK('bug16501',600);
-GET_LOCK('bug16501',600)
-1
-INSERT INTO t1 VALUES ('con1', CONNECTION_ID());
-SELECT IS_USED_LOCK('bug16501') = connection_id
-FROM t1
-WHERE conn = 'default';
-IS_USED_LOCK('bug16501') = connection_id
-1
- SELECT GET_LOCK('bug16501',600);
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-IS_USED_LOCK('bug16501') = CONNECTION_ID()
-1
-SELECT RELEASE_LOCK('bug16501');
-RELEASE_LOCK('bug16501')
-1
-GET_LOCK('bug16501',600)
-1
-SELECT IS_USED_LOCK('bug16501') = connection_id
-FROM t1
-WHERE conn = 'con1';
-IS_USED_LOCK('bug16501') = connection_id
-1
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-IS_USED_LOCK('bug16501') = CONNECTION_ID()
-1
-SELECT RELEASE_LOCK('bug16501');
-RELEASE_LOCK('bug16501')
-1
-SELECT IS_USED_LOCK('bug16501');
-IS_USED_LOCK('bug16501')
-NULL
-DROP TABLE t1;
--- 1.15/mysql-test/t/func_misc.test 2006-08-04 05:29:16 -07:00
+++ 1.16/mysql-test/t/func_misc.test 2006-08-04 05:29:16 -07:00
@@ -43,44 +43,4 @@
show create table t1;
drop table t1;
-
-#
-# Bug#16501: IS_USED_LOCK does not appear to work
-#
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-CREATE TABLE t1 (conn CHAR(7), connection_id INT);
-INSERT INTO t1 VALUES ('default', CONNECTION_ID());
-
-SELECT GET_LOCK('bug16501',600);
-
-connect (con1,localhost,root,,);
-INSERT INTO t1 VALUES ('con1', CONNECTION_ID());
-SELECT IS_USED_LOCK('bug16501') = connection_id
-FROM t1
-WHERE conn = 'default';
-send SELECT GET_LOCK('bug16501',600);
-
-connection default;
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-SELECT RELEASE_LOCK('bug16501');
-connection con1;
-reap;
-connection default;
-SELECT IS_USED_LOCK('bug16501') = connection_id
-FROM t1
-WHERE conn = 'con1';
-
-connection con1;
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-SELECT RELEASE_LOCK('bug16501');
-SELECT IS_USED_LOCK('bug16501');
-
-disconnect con1;
-connection default;
-
-DROP TABLE t1;
-
# End of 4.1 tests
| Thread |
|---|
| • bk commit into 4.1 tree (igreenhoe:1.2537) BUG#21123 | Ian Greenhoe | 4 Aug |
