database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity
Files
2535b0685640580beccf67658074232b8a119000
mariadb/mysql-test
History
mmakela 2535b06856 branches/zip: Merge revisions 6788:6918 from branches/5.1: 
------------------------------------------------------------------------
  r6822 | vasil | 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) | 12 lines
  Changed paths:
     M /branches/5.1/row/row0sel.c

  branches/5.1:

  Typecast to silence a compiler warning:

  row/row0sel.c: 4548
          C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data
  row/row0sel.c: 4553
          C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data

  Reported by:	Jonas Oreland <Jonas.Oreland@Sun.COM>
  Discussed with:	Sunny Bains <sunny.bains@oracle.com>
  ------------------------------------------------------------------------
  r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb_bug38231.test

  branches/5.1:

  Fix a non-determinism in innodb_bug38231.

  Reported by:	Sergey Vojtovich <svoj@Sun.COM>
  ------------------------------------------------------------------------
  r6911 | vdimov | 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) | 2 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc

  branches/5.1: Whitespace fixup
  ------------------------------------------------------------------------
  r6912 | vdimov | 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) | 2 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc

  branches/5.1: Whitespace fixup on line 354
  ------------------------------------------------------------------------
  r6918 | mmakela | 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) | 6 lines
  Changed paths:
     A /branches/5.1/mysql-test/innodb_bug51920.result
     A /branches/5.1/mysql-test/innodb_bug51920.test
     M /branches/5.1/srv/srv0srv.c

  branches/5.1: Obey KILL during a lock wait (Bug #51920).

  srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
  Check trx_is_interrupted() in addition to checking the lock wait timeout.

  rb://279 approved by Sunny Bains
  ------------------------------------------------------------------------
2010-03-31 07:34:22 +00:00
..
patches
branches/zip: Report duplicate table names
2009-11-17 14:44:20 +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_bug21704.result
branches/zip: Merge revisions 6669:6788 from branches/5.1:
2010-03-10 12:02:19 +00:00
innodb_bug21704.test
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
2009-07-14 06:16:18 +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: mysql-test: Pass MTR's internal checks.
2009-08-04 10:42:44 +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: mysql-test: Pass MTR's internal checks.
2009-08-04 10:42:44 +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: mysql-test: Pass MTR's internal checks.
2009-08-04 10:42:44 +00:00
innodb_bug38231.result
branches/zip: Copy tests from branches/5.1 that were lost in some merge.
2010-03-10 11:56:41 +00:00
innodb_bug38231.test
branches/zip: Merge revisions 6788:6918 from branches/5.1:
2010-03-31 07:34:22 +00:00
innodb_bug39438-master.opt
branches/zip: Copy tests from branches/5.1 that were lost in some merge.
2010-03-10 11:56:41 +00:00
innodb_bug39438.result
branches/zip: Copy tests from branches/5.1 that were lost in some merge.
2010-03-10 11:56:41 +00:00
innodb_bug39438.test
branches/zip: Copy tests from branches/5.1 that were lost in some merge.
2010-03-10 11:56:41 +00:00
innodb_bug40360.result
branches/zip:
2008-10-30 10:17:23 +00:00
innodb_bug40360.test
branches/zip:
2008-10-30 10:17:23 +00:00
innodb_bug40565.result
branches/zip: Merge revisions 5148:5233 from branches/5.1:
2009-06-03 11:26:41 +00:00
innodb_bug40565.test
branches/zip: Merge revisions 5148:5233 from branches/5.1:
2009-06-03 11:26:41 +00:00
innodb_bug41904.result
branches/zip: Add the tests that were forgotten from r3795.
2009-01-07 14:19:32 +00:00
innodb_bug41904.test
branches/zip: Add the tests that were forgotten from r3795.
2009-01-07 14:19:32 +00:00
innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
2009-11-17 11:51:16 +00:00
innodb_bug42101-nonzero.result
branches/zip: Fix a race condition caused by
2009-06-25 11:55:52 +00:00
innodb_bug42101-nonzero.test
branches/zip: Fix a race condition caused by
2009-06-25 11:55:52 +00:00
innodb_bug42101.result
branches/zip: Fix a race condition caused by
2009-06-25 11:55:52 +00:00
innodb_bug42101.test
branches/zip: Fix a race condition caused by
2009-06-25 11:55:52 +00:00
innodb_bug44032.result
branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676.
2009-04-07 12:19:31 +00:00
innodb_bug44032.test
branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676.
2009-04-07 12:19:31 +00:00
innodb_bug44369.result
branches/zip: Report duplicate table names
2009-11-17 14:44:20 +00:00
innodb_bug44369.test
branches/zip: Report duplicate table names
2009-11-17 14:44:20 +00:00
innodb_bug44571.result
branches/zip: Once change in bug #47621 merges into zip branch,
2010-03-11 07:59:42 +00:00
innodb_bug44571.test
branches/zip: Once change in bug #47621 merges into zip branch,
2010-03-11 07:59:42 +00:00
innodb_bug45357.result
branches/zip: Merge revisions 5233:5341 from branches/5.1:
2009-06-17 09:15:32 +00:00
innodb_bug45357.test
branches/zip: Merge revisions 5233:5341 from branches/5.1:
2009-06-17 09:15:32 +00:00
innodb_bug46000.result
branches/zip: Port bug #46000 related changes from 5.1 to zip
2009-10-22 01:58:39 +00:00
innodb_bug46000.test
branches/zip: Port bug #46000 related changes from 5.1 to zip
2009-10-22 01:58:39 +00:00
innodb_bug46676.result
branches/zip: add test case for bug#46676
2009-11-12 12:40:43 +00:00
innodb_bug46676.test
branches/zip: add test case for bug#46676
2009-11-12 12:40:43 +00:00
innodb_bug47167.result
branches/zip: Fix an issue that a local variable defined
2009-11-11 12:27:09 +00:00
innodb_bug47167.test
branches/zip: Fix an issue that a local variable defined
2009-11-11 12:27:09 +00:00
innodb_bug47621.result
branches/zip: Merge revisions 6669:6788 from branches/5.1:
2010-03-10 12:02:19 +00:00
innodb_bug47621.test
branches/zip: Merge revisions 6669:6788 from branches/5.1:
2010-03-10 12:02:19 +00:00
innodb_bug47622.result
branches/zip: Add index translation table to map mysql index
2010-01-28 16:12:40 +00:00
innodb_bug47622.test
branches/zip: Add index translation table to map mysql index
2010-01-28 16:12:40 +00:00
innodb_bug47777.result
branches/zip: Merge r5912:6112 from branches/5.1:
2009-10-29 16:15:50 +00:00
innodb_bug47777.test
branches/zip: Merge r5912:6112 from branches/5.1:
2009-10-29 16:15:50 +00:00
innodb_bug51378.result
branches/zip: If a unique index is on a column prefix, such
2010-03-10 09:18:18 +00:00
innodb_bug51378.test
branches/zip: If a unique index is on a column prefix, such
2010-03-10 09:18:18 +00:00
innodb_bug51920.result
branches/zip: Merge revisions 6788:6918 from branches/5.1:
2010-03-31 07:34:22 +00:00
innodb_bug51920.test
branches/zip: Merge revisions 6788:6918 from branches/5.1:
2010-03-31 07:34:22 +00:00
innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
2009-11-11 12:27:09 +00:00
innodb_file_format.test
branches/zip: mysql-test: Pass MTR's internal checks.
2009-08-04 10:42:44 +00:00
innodb_information_schema.result
branches/zip:
2007-11-21 12:01:36 +00:00
innodb_information_schema.test
branches/zip:
2009-10-19 12:04:59 +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
innodb-analyze.result
branches/zip:
2008-09-15 10:40:44 +00:00
innodb-analyze.test
branches/zip: mysql-test: Pass MTR's internal checks.
2009-08-04 10:42:44 +00:00
innodb-autoinc-44030.result
branches/zip: Merge revisions 6471:6538 from branches/5.1:
2010-02-01 09:31:12 +00:00
innodb-autoinc-44030.test
branches/zip: Merge revisions 6471:6538 from branches/5.1:
2010-02-01 09:31:12 +00:00
innodb-autoinc.result
branches/zip: Merge revisions 6471:6538 from branches/5.1:
2010-02-01 09:31:12 +00:00
innodb-autoinc.test
branches/zip: Merge revisions 6471:6538 from branches/5.1:
2010-02-01 09:31:12 +00:00
innodb-consistent-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
2009-11-17 11:51:16 +00:00
innodb-consistent.result
branches/zip: Merge revisions 2584:2956 from branches/6.0,
2009-09-19 06:14:25 +00:00
innodb-consistent.test
branches/zip:
2010-03-10 07:16:50 +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-index.inc
branches/zip:
2007-11-21 10:47:08 +00:00
innodb-index.result
branches/zip: Disallow duplicate index name when creating an index.
2010-03-03 10:52:55 +00:00
innodb-index.test
branches/zip: Disallow duplicate index name when creating an index.
2010-03-03 10:52:55 +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: Prepend loose_ to plugin-only mysql-test options.
2009-11-17 11:51:16 +00:00
innodb-replace.result
branches/zip: Merge 2489:2524 from branches/5.1:
2008-07-01 06:53:40 +00:00
innodb-replace.test
branches/zip: Merge 2489:2524 from branches/5.1:
2008-07-01 06:53:40 +00:00
innodb-semi-consistent-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
2009-11-17 11:51:16 +00:00
innodb-semi-consistent.result
branches/zip: Merge revisions 4359:4400 from branches/5.1:
2009-03-12 08:26:40 +00:00
innodb-semi-consistent.test
branches/zip: Merge revisions 4359:4400 from branches/5.1:
2009-03-12 08:26:40 +00:00
innodb-timeout.result
branches/zip: Make innodb_lock_wait_timeout a settable session variable
2008-10-03 09:24:23 +00:00
innodb-timeout.test
branches/zip: Make innodb_lock_wait_timeout a settable session variable
2008-10-03 09:24:23 +00:00
innodb-use-sys-malloc-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
2009-11-17 11:51:16 +00:00
innodb-use-sys-malloc.result
branches/zip: Implement the parameter innodb_use_sys_malloc
2009-01-02 13:10:50 +00:00
innodb-use-sys-malloc.test
branches/zip: Implement the parameter innodb_use_sys_malloc
2009-01-02 13:10:50 +00:00
innodb-zip.result
branches/zip: Update test result with the WARN_LEVEL_ERROR
2009-10-23 07:45:50 +00:00
innodb-zip.test
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
2009-10-22 02:51:07 +00:00
innodb.result
branches/zip: Disallow duplicate index name when creating an index.
2010-03-03 10:52:55 +00:00
innodb.test
branches/zip: Disallow duplicate index name when creating an index.
2010-03-03 10:52:55 +00:00