push into mysql-6.0-falcon branch (cpowers:2742) Bug#38043

[Christopher Powers]

------------------------------------------------------------
revno: 2742
revision-id: cpowers@stripped
parent: cpowers@stripped
committer: Christopher Powers <cpowers@stripped>
branch nick: mysql
timestamp: Mon 2008-07-14 00:32:03 -0500
message:
  Bug#38043: Deadlock between server and falcon
  
  Restore warning in results file until online alter fixed
modified:
  mysql-test/suite/falcon/r/falcon_bug_22161.result
sp1f-falcon_bug_22161.res-20070920154256-3aawtwjhlqp4kqhhgqnrx5tunnfwipuw
=== modified file 'mysql-test/suite/falcon/r/falcon_bug_22161.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_22161.result	2008-07-09 10:23:27 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22161.result	2008-07-14 05:32:03 +0000
@@ -12,6 +12,7 @@
 Warnings:
 Warning	1071	Specified key was too long; max key length is 1100 bytes
 Warning	1071	Specified key was too long; max key length is 1100 bytes
+Warning	1071	Specified key was too long; max key length is 1100 bytes
 SELECT count(*) FROM t1;
 count(*)
 1