Commit 47a04798 authored Apr 26, 2006 by unknown

Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work

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


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

parents 0b64b882 a4c62dbb

mysql-test/r/innodb_mysql.result

0 → 100644

+1 −0

Original line number	Diff line number	Diff line

mysql-test/t/innodb.test

+13 −0

Original line number	Diff line number	Diff line
		#######################################################################
		# #
		# 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

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		-- source include/have_innodb.inc