bk commit into 6.0 tree (vvaintroub:1.2635) BUG#36249

[vvaintroub]

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-22 13:07:35+02:00, vvaintroub@wva. +3 -0
  Bug#36249 : correct timing dependency in test case
  Also, comment out tests that will not be fixed in the long run.

  mysql-test/suite/falcon/r/falcon_bug_22183.result@stripped, 2008-04-22 13:07:32+02:00,
vvaintroub@wva. +5 -2
    Correct timing dependency bug in the test case

  mysql-test/suite/falcon/t/falcon_bug_22183.test@stripped, 2008-04-22 13:07:32+02:00,
vvaintroub@wva. +13 -4
    Bug#36249
    
    Correct bug (timing dependency) in test case:
    
    "Alter  table" does implicit autocommit, therefore if another 
    transaction is doing  an update in parallel , 
    the response code in alter is dependent  on timing.
    
    Fix: do explicit commit before alter table

  mysql-test/suite/falcon_team/t/disabled.def@stripped, 2008-04-22 13:07:33+02:00,
vvaintroub@wva. +3 -1
    Comment out tests that will not be fixed for *long* time.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22183.result
b/mysql-test/suite/falcon/r/falcon_bug_22183.result
--- a/mysql-test/suite/falcon/r/falcon_bug_22183.result	2007-09-20 17:43:00 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_22183.result	2008-04-22 13:07:32 +02:00
@@ -15,11 +15,14 @@ SET @@autocommit = 0;
 START TRANSACTION;
 INSERT INTO t VALUES (3,'b','b');
 # Switch to connection default
-ALTER TABLE t ADD PRIMARY KEY (s1);
-ERROR 42000: Multiple primary key defined
 COMMIT;
 # Switch to connection conn1
 ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
+COMMIT;
+# Switch to connection default
+START TRANSACTION;
+ALTER TABLE t ADD PRIMARY KEY (s1);
+ERROR 42000: Multiple primary key defined
 COMMIT;
 ALTER TABLE t DROP PRIMARY KEY;
 # Switch to connection default
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-10-05 14:21:26 +02:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_22183.test	2008-04-22 13:07:32 +02:00
@@ -29,10 +29,6 @@ START TRANSACTION;
 
 --echo # Switch to connection default
 connection default;
-# We get a "multiple primary key defined", as the previous
-# DROP PRIMARY KEY did not worked.
---error ER_MULTIPLE_PRI_KEY
-ALTER TABLE t ADD PRIMARY KEY (s1);
 COMMIT;
 
 --echo # Switch to connection conn1
@@ -40,6 +36,19 @@ connection conn1;
 --error ER_DUP_ENTRY
 --reap
 COMMIT;
+
+
+# We get a "multiple primary key defined", as the previous
+# DROP PRIMARY KEY did not worked.
+--echo # Switch to connection default
+connection default;
+START TRANSACTION;
+--error ER_MULTIPLE_PRI_KEY
+ALTER TABLE t ADD PRIMARY KEY (s1);
+COMMIT;
+
+
+connection conn1;
 ALTER TABLE t DROP PRIMARY KEY;
 
 --echo # Switch to connection default
diff -Nrup a/mysql-test/suite/falcon_team/t/disabled.def
b/mysql-test/suite/falcon_team/t/disabled.def
--- a/mysql-test/suite/falcon_team/t/disabled.def	2008-04-21 14:19:12 +02:00
+++ b/mysql-test/suite/falcon_team/t/disabled.def	2008-04-22 13:07:33 +02:00
@@ -16,4 +16,6 @@
 #    Only exception is for tests, which are considered as "won't fix" for long time.
 #    Also please keep the list sorted.
 
-#falcon_bug_23945    : Bug#34892 2008-02-27 hakank Open bug
+falcon_bug_22166	: Bug#22166 tests  for case-sensitive identifiers.Will probably never be
fixed (besides , can never run on case-insensitive filesystems)  2008-04-21  vvaintroub 
+falcon_bug_22187	: Bug#22187 Tests for foreign key.Useless without FK
implementation	2008-04-21  vvaintroub
+