Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/alexi/innodb/mysql-4.1-innodb
This commit is contained in:
commit
f3ca0c28e4
1
mysql-test/r/innodb_mysql.result
Normal file
1
mysql-test/r/innodb_mysql.result
Normal file
@ -0,0 +1 @@
|
||||
drop table if exists t1;
|
@ -1,3 +1,16 @@
|
||||
#######################################################################
|
||||
# #
|
||||
# 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
|
||||
|
||||
#
|
||||
|
5
mysql-test/t/innodb_mysql.test
Normal file
5
mysql-test/t/innodb_mysql.test
Normal file
@ -0,0 +1,5 @@
|
||||
-- source include/have_innodb.inc
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
Loading…
x
Reference in New Issue
Block a user