1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

revert the following CS on grounds of "right patch, wrong time":

"Apply InnoDB snapshot innodb-5.1-ss2438.

  Addresses the following bugs:

  Change the fix for Bug#32440 to show bytes instead of kilobytes in
  INFORMATION_SCHEMA.TABLES.DATA_FREE.

  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.

  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().

  Fix Bug#36169 create innodb compressed table with too large row size crash
  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.

  Fix Bug#36434 ha_innodb.so is installed in the wrong directory
  Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been
  forgotten in this commit: http://lists.mysql.com/commits/40206"


mysql-test/r/innodb.result:
  revert InnoDB snapshot innodb-5.1-ss2438
mysql-test/r/mix2_myisam.result:
  merge-fixes: undoing previous unspecified post-merge fixes
  by kaa a/o 2008/2/13 (1.7)
mysql-test/t/innodb.test:
  revert InnoDB snapshot innodb-5.1-ss2438
storage/innobase/Makefile.am:
  revert InnoDB snapshot innodb-5.1-ss2438
storage/innobase/handler/ha_innodb.cc:
  revert InnoDB snapshot innodb-5.1-ss2438
storage/innobase/plug.in:
  revert InnoDB snapshot innodb-5.1-ss2438
storage/innobase/row/row0mysql.c:
  revert InnoDB snapshot innodb-5.1-ss2438
storage/innobase/row/row0sel.c:
  revert InnoDB snapshot innodb-5.1-ss2438
This commit is contained in:
unknown
2008-05-14 10:45:32 +02:00
parent 2cc7999b12
commit 2c91699e91
8 changed files with 43 additions and 133 deletions

View File

@ -3263,22 +3263,3 @@ AUTO_INCREMENT
200
DROP TABLE t2;
DROP TABLE t1;
CREATE TABLE t1 (c1 int default NULL,
c2 int default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
TRUNCATE TABLE t1;
affected rows: 0
INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
affected rows: 5
info: Records: 5 Duplicates: 0 Warnings: 0
TRUNCATE TABLE t1;
affected rows: 0
DROP TABLE t1;
Variable_name Value
Handler_update 0
Variable_name Value
Handler_delete 0
Variable_name Value
Handler_update 1
Variable_name Value
Handler_delete 1