mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test
History
vasil 49589d0ae2 branches/zip: 
Merge 2744:2837 from branches/5.1 (skipping r2782 and r2826):

  ------------------------------------------------------------------------
  r2832 | vasil | 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) | 10 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc
  
  branches/5.1:
  
  In ha_innobase::info():
  
  Replace sql_print_warning() which prints to mysqld error log with
  push_warning_printf() which sends the error message to the client.
  
  Suggested by:	Marko, Sunny, Michael
  Objected by:	Inaam
  
  ------------------------------------------------------------------------
  r2837 | vasil | 2008-10-21 12:07:44 +0300 (Tue, 21 Oct 2008) | 32 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb-semi-consistent.result
     M /branches/5.1/mysql-test/innodb-semi-consistent.test
     M /branches/5.1/mysql-test/innodb.result
     M /branches/5.1/mysql-test/innodb.test
  
  branches/5.1:
  
  Merge a change from MySQL (this fixes the failing innodb and
  innodb-semi-consistent tests):
  
    revno: 2757
    committer: Georgi Kodinov <kgeorge@mysql.com>
    branch nick: B39812-5.1-5.1.29-rc
    timestamp: Fri 2008-10-03 15:24:19 +0300
    message:
      Bug #39812: Make statement replication default for 5.1 (to match 5.0)
      
      Make STMT replication default for 5.1.
      Add a default of MIXED into the config files
      Fix the tests that needed MIXED replication mode.
    modified:
      mysql-test/include/mix1.inc
      mysql-test/r/innodb-semi-consistent.result
      mysql-test/r/innodb.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/tx_isolation_func.result
      mysql-test/t/innodb-semi-consistent.test
      mysql-test/t/innodb.test
      mysql-test/t/tx_isolation_func.test
      sql/mysqld.cc
      support-files/my-huge.cnf.sh
      support-files/my-innodb-heavy-4G.cnf.sh
      support-files/my-large.cnf.sh
      support-files/my-medium.cnf.sh
      support-files/my-small.cnf.sh
  
  
  ------------------------------------------------------------------------
2008-10-21 08:49:27 +00:00
..
patches branches/zip: 2008-10-13 14:34:34 +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-analyze.result branches/zip: 2008-09-15 10:40:44 +00:00
innodb-analyze.test branches/zip: 2008-09-15 10:40:44 +00:00
innodb-autoinc.result branches/zip: Merge revisions 2702:2722 from branches/5.1: 2008-10-04 03:22:36 +00:00
innodb-autoinc.test branches/zip: Merge revisions 2702:2722 from branches/5.1: 2008-10-04 03:22:36 +00:00
innodb-index.inc branches/zip: 2007-11-21 10:47:08 +00:00
innodb-index.result branches/zip: Skip the undo log size check on REDUNDANT and COMPACT tables. 2008-10-16 05:41:13 +00:00
innodb-index.test branches/zip: Skip the undo log size check on REDUNDANT and COMPACT tables. 2008-10-16 05:41:13 +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 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: Merge 1937:2015 from trunk. 2007-10-24 10:59:54 +00:00
innodb-semi-consistent.result branches/zip: 2008-10-21 08:49:27 +00:00
innodb-semi-consistent.test branches/zip: 2008-10-21 08:49:27 +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-zip.result branches/zip: When creating an index in innodb_strict_mode, check that 2008-09-18 12:31:17 +00:00
innodb-zip.test branches/zip: When creating an index in innodb_strict_mode, check that 2008-09-18 12:31:17 +00:00
innodb.result branches/zip: 2008-10-21 08:49:27 +00:00
innodb.test branches/zip: 2008-10-21 08:49:27 +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: Prevent infinite B-tree page splits by ensuring that 2008-09-17 06:23:52 +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