From a4c62dbb8a8580827593deb72d71e73037b61871 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Apr 2006 09:51:57 +0400 Subject: [PATCH 1/2] Files innodb.[test|result] are to be used by Innobase only. Use files innodb_mysql.[test|result] instead. mysql-test/t/innodb.test: This file is to be used by Innobase only. mysql-test/r/innodb_mysql.result: New BitKeeper file ``mysql-test/r/innodb_mysql.result'' Use this file instead of innodb.result. mysql-test/t/innodb_mysql.test: New BitKeeper file ``mysql-test/t/innodb_mysql.test'' Use this file instead of innodb.test. --- mysql-test/r/innodb_mysql.result | 1 + mysql-test/t/innodb.test | 13 +++++++++++++ mysql-test/t/innodb_mysql.test | 1 + 3 files changed, 15 insertions(+) create mode 100644 mysql-test/r/innodb_mysql.result create mode 100644 mysql-test/t/innodb_mysql.test 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 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..5e5ec5a1f3c --- /dev/null +++ b/mysql-test/t/innodb_mysql.test @@ -0,0 +1 @@ +-- source include/have_innodb.inc From c2e6c898acf40844343b11e33a593a21a084680d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Apr 2006 11:15:09 +0400 Subject: [PATCH 2/2] Make innodb_mysql produce a non-empty output. mysql-test/r/innodb_mysql.result: Fix result. --- mysql-test/r/innodb_mysql.result | 2 +- mysql-test/t/innodb_mysql.test | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 8b137891791..878c5cb5451 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -1 +1 @@ - +drop table if exists t1; diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index 5e5ec5a1f3c..b942b9fbc0d 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -1 +1,5 @@ -- source include/have_innodb.inc + +--disable_warnings +drop table if exists t1; +--enable_warnings