branches/5.1: revert the changes in r2933

The changes in r2933 causes test failure on Linux.
More investigation is needed for Windows.

Change the followings in innodb-autoinc.result:
  auto-increment-increment
  auto-increment-offset

back to:
  auto_increment_increment
  auto_increment_offset

mysql-test/innodb-autoinc.result

@@ -566,8 +566,8 @@ c1
 18446744073709551610
 SET @@SESSION.AUTO_INCREMENT_INCREMENT=1152921504606846976, @@SESSION.AUTO_INCREMENT_OFFSET=1152921504606846976;
 Warnings:
-Warning	1292	Truncated incorrect auto-increment-increment value: '1152921504606846976'
-Warning	1292	Truncated incorrect auto-increment-offset value: '1152921504606846976'
+Warning	1292	Truncated incorrect auto_increment_increment value: '1152921504606846976'
+Warning	1292	Truncated incorrect auto_increment_offset value: '1152921504606846976'
 SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	65535