mariadb/mysql-test
vasil 55db138b95 branches/zip: Merge 2384:2423 from branches/5.1:
------------------------------------------------------------------------
  r2386 | vasil | 2008-03-27 07:45:02 +0200 (Thu, 27 Mar 2008) | 22 lines
  
  branches/5.1:
  
  Merge change from MySQL (this fixes the failing innodb test):
  
  ChangeSet@1.1810.3601.4, 2008-02-07 02:33:21+04:00, gshchepa@host.loc +9 -0
    Fixed bug#30059.
    Server handles truncation for assignment of too-long values
    into CHAR/VARCHAR/TEXT columns in a different ways when the
    truncated characters are spaces:
    1. CHAR(N) columns silently ignore end-space truncation;
    2. TEXT columns post a truncation warning/error in the
       non-strict/strict mode.
    3. VARCHAR columns always post a truncation note in
       any mode.
  
    Space truncation processing has been synchronised over
    CHAR/VARCHAR/TEXT columns: current behavior of VARCHAR
    columns has been propagated as standard.
  
    Binary-encoded string/BLOB columns are not affected.
  
  
  ------------------------------------------------------------------------
  r2387 | vasil | 2008-03-27 08:49:05 +0200 (Thu, 27 Mar 2008) | 8 lines
  
  branches/5.1:
  
  Check whether *trx->mysql_query_str is != NULL in addition to
  trx->mysql_query_str. This adds more safety.
  
  This may or may not fix Bug#35226 RBR event crashes slave.
  
  
  ------------------------------------------------------------------------
  r2388 | vasil | 2008-03-27 14:02:34 +0200 (Thu, 27 Mar 2008) | 7 lines
  
  branches/5.1:
  
  Swap the order in which mysql_thd, mysql_query_str and *mysql_query_str
  are checked for non-NULL.
  
  Suggested by:	Marko
  
  ------------------------------------------------------------------------
  r2419 | vasil | 2008-04-23 19:08:06 +0300 (Wed, 23 Apr 2008) | 9 lines
  
  branches/5.1:
  
  Change the fix for Bug#32440 to show bytes instead of kilobytes in
  INFORMATION_SCHEMA.TABLES.DATA_FREE.
  
  Suggested by:	Domas Mituzas <domas@mysql.com>
  Approved by:	Heikki
  
  
  ------------------------------------------------------------------------
  r2420 | calvin | 2008-04-24 15:25:30 +0300 (Thu, 24 Apr 2008) | 4 lines
  
  branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected
  
  In InnoDB, the row count is only a rough estimate used by SQL
  optimization. InnoDB is now return row count 0 for TRUNCATE operation.
  ------------------------------------------------------------------------
  r2421 | calvin | 2008-04-24 15:32:30 +0300 (Thu, 24 Apr 2008) | 6 lines
  
  branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update
  and handler_delete
  
  Add the calls to ha_statistic_increment() in ha_innobase::delete_row()
  and ha_innobase::update_row().
  
  ------------------------------------------------------------------------
  r2422 | vasil | 2008-04-24 16:00:30 +0300 (Thu, 24 Apr 2008) | 11 lines
  
  branches/5.1:
  
  Fix Bug#36169 create innodb compressed table with too large row size crashed
  
  Sometimes it is possible that
  row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in
  row_create_index_for_mysql() when the index object is freed so copy the
  table name to a safe place beforehand and use the copy.
  
  Approved by:	Sunny
  
  ------------------------------------------------------------------------
2008-04-30 05:42:56 +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: Implementation of using animal names for innodb_file_format, 2008-04-10 11:02:16 +00:00
innodb-zip.test branches/zip: Implementation of using animal names for innodb_file_format, 2008-04-10 11:02:16 +00:00
innodb.result branches/zip: Merge 2384:2423 from branches/5.1: 2008-04-30 05:42:56 +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: 2008-04-23 05:45:19 +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