Merge a change from mysql-5.1-innodb:

------------------------------------------------------------ revno: 3500 revision-id: marko.makela@oracle.com-20100603095032-v5ptkkzt1bhz0m1d parent: marko.makela@oracle.com-20100603094859-8cibt7xns239jjvc committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Thu 2010-06-03 12:50:32 +0300 message: Move some InnoDB tests to mysql-test/suite/innodb.

Merge a change from mysql-5.1-innodb:
------------------------------------------------------------ revno: 3500 revision-id: marko.makela@oracle.com-20100603095032-v5ptkkzt1bhz0m1d parent: marko.makela@oracle.com-20100603094859-8cibt7xns239jjvc committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Thu 2010-06-03 12:50:32 +0300 message: Move some InnoDB tests to mysql-test/suite/innodb.
9cd41392 · Marko Mäkelä · e8e1ea91 · 9cd41392 · 9cd41392 · 9cd41392
Commit 9cd41392 authored Jun 03, 2010 by Marko Mäkelä
28 changed files
--- a/mysql-test/r/innodb-autoinc-optimize.result
+++ b/mysql-test/r/innodb-autoinc-optimize.result
--- a/mysql-test/r/innodb-ucs2.result
+++ b/mysql-test/r/innodb-ucs2.result
--- a/mysql-test/r/innodb_autoinc_lock_mode_zero.result
+++ b/mysql-test/r/innodb_autoinc_lock_mode_zero.result
--- a/mysql-test/r/innodb_bug30919.result
+++ b/mysql-test/r/innodb_bug30919.result
--- a/mysql-test/r/innodb_bug42419.result
+++ b/mysql-test/r/innodb_bug42419.result
--- a/mysql-test/r/innodb_gis.result
+++ b/mysql-test/r/innodb_gis.result
--- a/mysql-test/r/innodb_lock_wait_timeout_1.result
+++ b/mysql-test/r/innodb_lock_wait_timeout_1.result
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql_rbk.result
+++ b/mysql-test/r/innodb_mysql_rbk.result
--- a/mysql-test/r/innodb_notembedded.result
+++ b/mysql-test/r/innodb_notembedded.result
--- a/mysql-test/r/innodb_timeout_rollback.result
+++ b/mysql-test/r/innodb_timeout_rollback.result
--- a/mysql-test/t/innodb-autoinc-optimize.test
+++ b/mysql-test/t/innodb-autoinc-optimize.test
--- a/mysql-test/t/innodb-ucs2.test
+++ b/mysql-test/t/innodb-ucs2.test
--- a/mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt
+++ b/mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt
--- a/mysql-test/t/innodb_autoinc_lock_mode_zero.test
+++ b/mysql-test/t/innodb_autoinc_lock_mode_zero.test
--- a/mysql-test/t/innodb_bug30919-master.opt
+++ b/mysql-test/t/innodb_bug30919-master.opt
--- a/mysql-test/t/innodb_bug30919.test
+++ b/mysql-test/t/innodb_bug30919.test
--- a/mysql-test/t/innodb_bug42419.test
+++ b/mysql-test/t/innodb_bug42419.test
--- a/mysql-test/t/innodb_gis.test
+++ b/mysql-test/t/innodb_gis.test
--- a/mysql-test/t/innodb_lock_wait_timeout_1-master.opt
+++ b/mysql-test/t/innodb_lock_wait_timeout_1-master.opt
--- a/mysql-test/t/innodb_lock_wait_timeout_1.test
+++ b/mysql-test/t/innodb_lock_wait_timeout_1.test
--- a/mysql-test/t/innodb_mysql-master.opt
+++ b/mysql-test/t/innodb_mysql-master.opt
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
--- a/mysql-test/t/innodb_mysql_rbk-master.opt
+++ b/mysql-test/t/innodb_mysql_rbk-master.opt
--- a/mysql-test/t/innodb_mysql_rbk.test
+++ b/mysql-test/t/innodb_mysql_rbk.test
--- a/mysql-test/t/innodb_notembedded.test
+++ b/mysql-test/t/innodb_notembedded.test
--- a/mysql-test/t/innodb_timeout_rollback-master.opt
+++ b/mysql-test/t/innodb_timeout_rollback-master.opt
--- a/mysql-test/t/innodb_timeout_rollback.test
+++ b/mysql-test/t/innodb_timeout_rollback.test