diff options
| author | unknown <aivanov@mysql.com> | 2006-04-26 09:56:06 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-04-26 09:56:06 +0400 |
| commit | 47a04798117077f1e48983c5955dbebd8f229516 (patch) | |
| tree | 86f2445ff4517ccdf4d5e34eea62ddbeab72f117 /mysql-test | |
| parent | 0b64b882578d9149a5edcc7babcd66f6f7c8fcaf (diff) | |
| parent | a4c62dbb8a8580827593deb72d71e73037b61871 (diff) | |
| download | mariadb-git-47a04798117077f1e48983c5955dbebd8f229516.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 13 | ||||
| -rw-r--r-- | mysql-test/t/innodb_mysql.test | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/mysql-test/r/innodb_mysql.result @@ -0,0 +1 @@ + diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index fea4890286c..3ba5ca5b4a2 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -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 # diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test new file mode 100644 index 00000000000..5e5ec5a1f3c --- /dev/null +++ b/mysql-test/t/innodb_mysql.test @@ -0,0 +1 @@ +-- source include/have_innodb.inc |