bzr push into mysql-trunk-innodb branch (marko.makela:3093 to 3094)

[marko.makela]

 3094 Marko Mäkelä	2010-06-03
      Merge a change from mysql-5.1-innodb:
      
      ------------------------------------------------------------
      revno: 3500
      revision-id: marko.makela@strippedptkkzt1bhz0m1d
      parent: marko.makela@stripped0603094859-8cibt7xns239jjvc
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Thu 2010-06-03 12:50:32 +0300
      message:
        Move some InnoDB tests to mysql-test/suite/innodb.

    renamed:
      mysql-test/r/innodb-autoinc-optimize.result => mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
      mysql-test/r/innodb-ucs2.result => mysql-test/suite/innodb/r/innodb-ucs2.result
      mysql-test/r/innodb_autoinc_lock_mode_zero.result => mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
      mysql-test/r/innodb_bug30919.result => mysql-test/suite/innodb/r/innodb_bug30919.result
      mysql-test/r/innodb_bug42419.result => mysql-test/suite/innodb/r/innodb_bug42419.result
      mysql-test/r/innodb_gis.result => mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/r/innodb_lock_wait_timeout_1.result => mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
      mysql-test/r/innodb_mysql.result => mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/r/innodb_mysql_rbk.result => mysql-test/suite/innodb/r/innodb_mysql_rbk.result
      mysql-test/r/innodb_notembedded.result => mysql-test/suite/innodb/r/innodb_notembedded.result
      mysql-test/r/innodb_timeout_rollback.result => mysql-test/suite/innodb/r/innodb_timeout_rollback.result
      mysql-test/t/innodb-autoinc-optimize.test => mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
      mysql-test/t/innodb-ucs2.test => mysql-test/suite/innodb/t/innodb-ucs2.test
      mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
      mysql-test/t/innodb_autoinc_lock_mode_zero.test => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
      mysql-test/t/innodb_bug30919-master.opt => mysql-test/suite/innodb/t/innodb_bug30919-master.opt
      mysql-test/t/innodb_bug30919.test => mysql-test/suite/innodb/t/innodb_bug30919.test
      mysql-test/t/innodb_bug42419.test => mysql-test/suite/innodb/t/innodb_bug42419.test
      mysql-test/t/innodb_gis.test => mysql-test/suite/innodb/t/innodb_gis.test
      mysql-test/t/innodb_lock_wait_timeout_1-master.opt => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
      mysql-test/t/innodb_lock_wait_timeout_1.test => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
      mysql-test/t/innodb_mysql-master.opt => mysql-test/suite/innodb/t/innodb_mysql-master.opt
      mysql-test/t/innodb_mysql.test => mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/t/innodb_mysql_rbk-master.opt => mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
      mysql-test/t/innodb_mysql_rbk.test => mysql-test/suite/innodb/t/innodb_mysql_rbk.test
      mysql-test/t/innodb_notembedded.test => mysql-test/suite/innodb/t/innodb_notembedded.test
      mysql-test/t/innodb_timeout_rollback-master.opt => mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
      mysql-test/t/innodb_timeout_rollback.test => mysql-test/suite/innodb/t/innodb_timeout_rollback.test
 3093 Vasil Dimov	2010-06-02
      Adjust .bzr-mysql/default.conf that was reverted by a recent bzr pull

    modified:
      .bzr-mysql/default.conf
=== renamed file 'mysql-test/r/innodb-autoinc-optimize.result' => 'mysql-test/suite/innodb/r/innodb-autoinc-optimize.result'
=== renamed file 'mysql-test/r/innodb-ucs2.result' => 'mysql-test/suite/innodb/r/innodb-ucs2.result'
=== renamed file 'mysql-test/r/innodb_autoinc_lock_mode_zero.result' => 'mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result'
=== renamed file 'mysql-test/r/innodb_bug30919.result' => 'mysql-test/suite/innodb/r/innodb_bug30919.result'
=== renamed file 'mysql-test/r/innodb_bug42419.result' => 'mysql-test/suite/innodb/r/innodb_bug42419.result'
=== renamed file 'mysql-test/r/innodb_gis.result' => 'mysql-test/suite/innodb/r/innodb_gis.result'
=== renamed file 'mysql-test/r/innodb_lock_wait_timeout_1.result' => 'mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result'
=== renamed file 'mysql-test/r/innodb_mysql.result' => 'mysql-test/suite/innodb/r/innodb_mysql.result'
=== renamed file 'mysql-test/r/innodb_mysql_rbk.result' => 'mysql-test/suite/innodb/r/innodb_mysql_rbk.result'
=== renamed file 'mysql-test/r/innodb_notembedded.result' => 'mysql-test/suite/innodb/r/innodb_notembedded.result'
=== renamed file 'mysql-test/r/innodb_timeout_rollback.result' => 'mysql-test/suite/innodb/r/innodb_timeout_rollback.result'
=== renamed file 'mysql-test/t/innodb-autoinc-optimize.test' => 'mysql-test/suite/innodb/t/innodb-autoinc-optimize.test'
=== renamed file 'mysql-test/t/innodb-ucs2.test' => 'mysql-test/suite/innodb/t/innodb-ucs2.test'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt' => 'mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_zero.test' => 'mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test'
=== renamed file 'mysql-test/t/innodb_bug30919-master.opt' => 'mysql-test/suite/innodb/t/innodb_bug30919-master.opt'
=== renamed file 'mysql-test/t/innodb_bug30919.test' => 'mysql-test/suite/innodb/t/innodb_bug30919.test'
=== renamed file 'mysql-test/t/innodb_bug42419.test' => 'mysql-test/suite/innodb/t/innodb_bug42419.test'
=== renamed file 'mysql-test/t/innodb_gis.test' => 'mysql-test/suite/innodb/t/innodb_gis.test'
=== renamed file 'mysql-test/t/innodb_lock_wait_timeout_1-master.opt' => 'mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt'
=== renamed file 'mysql-test/t/innodb_lock_wait_timeout_1.test' => 'mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test'
=== renamed file 'mysql-test/t/innodb_mysql-master.opt' => 'mysql-test/suite/innodb/t/innodb_mysql-master.opt'
=== renamed file 'mysql-test/t/innodb_mysql.test' => 'mysql-test/suite/innodb/t/innodb_mysql.test'
=== renamed file 'mysql-test/t/innodb_mysql_rbk-master.opt' => 'mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt'
=== renamed file 'mysql-test/t/innodb_mysql_rbk.test' => 'mysql-test/suite/innodb/t/innodb_mysql_rbk.test'
=== renamed file 'mysql-test/t/innodb_notembedded.test' => 'mysql-test/suite/innodb/t/innodb_notembedded.test'
=== renamed file 'mysql-test/t/innodb_timeout_rollback-master.opt' => 'mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt'
=== renamed file 'mysql-test/t/innodb_timeout_rollback.test' => 'mysql-test/suite/innodb/t/innodb_timeout_rollback.test'
Attachment: [text/bzr-bundle] bzr/[e-mail]