mariadb/mysql-test
vasil 931e02c36b branches/zip: Merge 2485:2489 from branches/5.1:
------------------------------------------------------------------------
  r2488 | vasil | 2008-06-09 13:53:12 +0300 (Mon, 09 Jun 2008) | 15 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb.result
  
  branches/5.1:
  
  Merge change from MySQL (this almost fixes the failing innodb test):
  
    ChangeSet@1.2613, 2008-05-07 09:58:21+04:00, sergefp@mysql.com +5 -0
      BUG#35850 "Performance regression in 5.1.23/5.1.24"
      - Disable the "prefer full scan on clustered primary key over full scan
        of any secondary key" rule introduced by BUG#35850.
      - Update test results accordingly
      (bk trigger: file this for BUG#35850)
    
      mysql-test/r/innodb.result@1.214, 2008-05-07 09:57:31+04:00, sergefp@mysql.com +15 -15
        BUG#35850 "Performance regression in 5.1.23/5.1.24"
        - Update test results
  
  ------------------------------------------------------------------------
  r2489 | vasil | 2008-06-09 14:16:51 +0300 (Mon, 09 Jun 2008) | 20 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb.result
  
  branches/5.1:
  
  Merge change from MySQL (this fixes the failing innodb test):
  
    ChangeSet@1.2628  2008-05-13 17:01:02+05:00  gshchepa@host.loc
      Merge host.loc:/work/bugs/5.0-bugteam-30059
      into  host.loc:/work/bk/5.1-bugteam
  
  NOTE: the diff for mysql-test/r/innodb.result in this ChangeSet looks
  empty but the line:
  
  Data truncated for column 'c' at row 1
  
  is present in annotated mysql-test/r/innodb.result@1.215 [1]
  and not present in annotated mysql-test/r/innodb.result@1.216 [2] so it
  must have been deleted in the above ChangeSet.
  
  [1] http://mysql.bkbits.net:8080/mysql-5.1/mysql-test/r/innodb.result?PAGE=anno&REV=4825e033JNz_463Ha9pwInSjqLvIQg
  [2] http://mysql.bkbits.net:8080/mysql-5.1/mysql-test/r/innodb.result?PAGE=anno&REV=482982fcUoskWjhU2xMH2BZ4Gyukfg
  
  ------------------------------------------------------------------------
2008-06-09 10:25:09 +00:00
..
ctype_innodb_like.inc Import 5.0 code. 2005-10-27 07:29:40 +00:00
have_innodb.inc branches/zip: Merge 2295:2367 from branches/5.1. 2008-03-17 14:09:44 +00:00
innodb-autoinc.result branches/zip: Merge 2295:2367 from branches/5.1. 2008-03-17 14:09:44 +00:00
innodb-autoinc.test branches/zip: Merge 2295:2367 from branches/5.1. 2008-03-17 14:09:44 +00:00
innodb-index-master.opt branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense. 2007-12-17 15:49:59 +00:00
innodb-index.inc branches/zip: 2007-11-21 10:47:08 +00:00
innodb-index.result branches/zip: innodb-index.test: Test duplicate key failures for different 2008-01-04 15:25:59 +00:00
innodb-index.test branches/zip: innodb-index.test: Test duplicate key failures for different 2008-01-04 15:25:59 +00:00
innodb-index_ucs2.result branches/zip: 2007-11-21 11:23:05 +00:00
innodb-index_ucs2.test branches/zip: 2007-11-21 11:23:05 +00:00
innodb-lock.result Import 5.0 code. 2005-10-27 07:29:40 +00:00
innodb-lock.test branches/zip: Merge revisions 1322:1402 from trunk. 2007-04-02 05:39:41 +00:00
innodb-master.opt branches/zip: Merge revisions 265:459 from trunk. 2006-04-12 09:32:17 +00:00
innodb-replace.result branches/zip: Merge revisions 1322:1402 from trunk. 2007-04-02 05:39:41 +00:00
innodb-replace.test branches/zip: Merge revisions 1322:1402 from trunk. 2007-04-02 05:39:41 +00:00
innodb-semi-consistent-master.opt branches/zip: Merge 1937:2015 from trunk. 2007-10-24 10:59:54 +00:00
innodb-semi-consistent.result branches/zip: Merge 2236:2263 from branches/5.1. 2008-01-28 15:54:46 +00:00
innodb-semi-consistent.test branches/zip: Merge 2236:2263 from branches/5.1. 2008-01-28 15:54:46 +00:00
innodb-zip.result branches/zip: 2008-05-06 15:00:25 +00:00
innodb-zip.test branches/zip: 2008-05-06 15:00:25 +00:00
innodb.result branches/zip: Merge 2485:2489 from branches/5.1: 2008-06-09 10:25:09 +00:00
innodb.test branches/zip: Merge 2384:2423 from branches/5.1: 2008-04-30 05:42:56 +00:00
innodb_bug34053.result branches/zip: Merge 2263:2295 from branches/5.1. 2008-02-18 20:09:03 +00:00
innodb_bug34053.test branches/zip: Merge 2295:2367 from branches/5.1. 2008-03-17 14:09:44 +00:00
innodb_bug34300.result branches/zip: Merge 2367:2384 from branches/5.1. 2008-03-26 17:14:00 +00:00
innodb_bug34300.test branches/zip: Merge 2367:2384 from branches/5.1. 2008-03-26 17:14:00 +00:00
innodb_bug35220.result branches/zip: Merge 2367:2384 from branches/5.1. 2008-03-26 17:14:00 +00:00
innodb_bug35220.test branches/zip: Merge 2367:2384 from branches/5.1. 2008-03-26 17:14:00 +00:00
innodb_bug36169.result branches/zip: 2008-04-23 05:45:19 +00:00
innodb_bug36169.test branches/zip: Drop the tables that were created in the test. 2008-05-04 09:39:30 +00:00
innodb_bug36172.result branches/zip: Fix bug# 36172. The zip code changes a precondition that a 2008-05-08 10:08:09 +00:00
innodb_bug36172.test branches/zip: Fix bug# 36172. The zip code changes a precondition that a 2008-05-08 10:08:09 +00:00
innodb_information_schema.result branches/zip: 2007-11-21 12:01:36 +00:00
innodb_information_schema.test branches/zip: INFORMATION_SCHEMA.INNODB_LOCKS: Quote lock_table, lock_index. 2007-11-21 08:46:11 +00:00
innodb_trx_weight.inc branches/zip: Merge 1553:1556 from trunk. 2007-06-08 07:05:17 +00:00
innodb_trx_weight.result branches/zip: Merge 1493:1533 from trunk. 2007-05-29 08:48:16 +00:00
innodb_trx_weight.test branches/zip: Merge 1575:1664 from trunk. 2007-08-01 11:18:43 +00:00