diff options
| author | unknown <aivanov@mysql.com> | 2006-04-26 18:53:24 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-04-26 18:53:24 +0400 |
| commit | f3ca0c28e4ec1830adeb7780de0dfcd67b39352b (patch) | |
| tree | 0a1563adcaa192bfead3e2ee8c30915b8c3d85f6 | |
| parent | a940b1a7445e7b8e9db9d22bf919e30cbac4fe54 (diff) | |
| parent | 966658fa48583c6333cbf92465836ab76fab9fe3 (diff) | |
| download | mariadb-git-f3ca0c28e4ec1830adeb7780de0dfcd67b39352b.tar.gz | |
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/alexi/innodb/mysql-4.1-innodb
| -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 | 5 |
3 files changed, 19 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..878c5cb5451 --- /dev/null +++ b/mysql-test/r/innodb_mysql.result @@ -0,0 +1 @@ +drop table if exists t1; diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index ee411a1bb37..3e53cadf76c 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..b942b9fbc0d --- /dev/null +++ b/mysql-test/t/innodb_mysql.test @@ -0,0 +1,5 @@ +-- source include/have_innodb.inc + +--disable_warnings +drop table if exists t1; +--enable_warnings |