Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work


mysql-test/t/innodb.test:
  Auto merged

mysql-test/r/innodb_mysql.result

+

mysql-test/t/innodb.test

+#######################################################################
+#                                                                     #
+# Please, DO NOT TOUCH this file as well as the innodb.result file.   #
+# These files are to be modified ONLY BY INNOBASE guys.               #
+#                                                                     #
+# Use innodb_mysql.[test|result] files instead.                       #
+#                                                                     #
+# If nevertheless you need to make some changes here, please, forward #
+# your commit message To: dev@innodb.com Cc: dev-innodb@mysql.com     #
+# (otherwise your changes may be erased).                             #
+#                                                                     #
+#######################################################################
+
 -- source include/have_innodb.inc
 
 #

mysql-test/t/innodb_mysql.test

+-- source include/have_innodb.inc