branches/5.1:

Merge change from MySQL AB:

ChangeSet@1.2616, 2007-12-01 19:55:06+01:00, tnurnberg@mysql.com +8 -0
  Bug#31177: Server variables can't be set to their current values
 
  5.1+ specific fixes (plugins etc.)

  mysql-test/r/innodb.result@1.204, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -2
    we throw warnings to the client, yea, verily

mysql-test/innodb.result

@@ -1769,7 +1769,7 @@ Variable_name	Value
 innodb_thread_concurrency	8
 set global innodb_thread_concurrency=1001;
 Warnings:
-Warning	1292	Truncated incorrect innodb_thread_concurrency value: '1001'
+Warning	1292	Truncated incorrect thread_concurrency value: '1001'
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
 innodb_thread_concurrency	1000
@@ -1790,7 +1790,7 @@ Variable_name	Value
 innodb_concurrency_tickets	1000
 set global innodb_concurrency_tickets=0;
 Warnings:
-Warning	1292	Truncated incorrect innodb_concurrency_tickets value: '0'
+Warning	1292	Truncated incorrect concurrency_tickets value: '0'
 show variables like "innodb_concurrency_tickets";
 Variable_name	Value
 innodb_concurrency_tickets	1