Merge a change from MySQL AB:

# ChangeSet
#   2006/07/30 05:16:08+04:00 aivanov@mysql.com 
#   Make innodb_thread_concurrency 0 by default.
#    Fixing test result.
# 
# mysql-test/r/innodb.result
#   2006/07/30 05:16:05+04:00 aivanov@mysql.com +1 -1
#   Make innodb_thread_concurrency 0 by default.
#    Fixing test result.

mysql-test/innodb.result

@@ -1807,7 +1807,7 @@ innodb_thread_concurrency	1000
 set global innodb_thread_concurrency=0;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
-innodb_thread_concurrency	1
+innodb_thread_concurrency	0
 set global innodb_thread_concurrency=16;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value