[Commits] c51fc679f50: Merge 5.5 into 10.0

marko.makela at mariadb.com marko.makela at mariadb.com
Fri Mar 24 18:19:23 EET 2017


revision-id: c51fc679f50cf202d11f159ae661e9f8026fab6d (mariadb-10.0.30-18-gc51fc679f50)
parent(s): 0d622bed4f1a1484af747840c39325c67d7767d4 a821ef76057f17a9532f525d2858bb1d31c0a56d
author: Marko Mäkelä
committer: Marko Mäkelä
timestamp: 2017-03-24 18:19:15 +0200
message:

Merge 5.5 into 10.0


 .../suite/innodb/r/innodb_bug14676111.result       | 29 +++++-----
 mysql-test/suite/innodb/t/innodb_bug14676111.test  | 65 ++++++++++------------
 2 files changed, 43 insertions(+), 51 deletions(-)

diff --cc mysql-test/suite/innodb/r/innodb_bug14676111.result
index 1135259cfbf,ca4a7fd7e4a..fd73ca298fe
--- a/mysql-test/suite/innodb/r/innodb_bug14676111.result
+++ b/mysql-test/suite/innodb/r/innodb_bug14676111.result
@@@ -1,62 -1,59 +1,59 @@@
+ set @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
 -CREATE TABLE t1 (a int not null primary key) engine=InnoDB;
 +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
  set global innodb_limit_optimistic_insert_debug = 2;
  insert into t1 values (1);
+ begin;
  insert into t1 values (5);
+ begin;
  insert into t1 values (4);
  insert into t1 values (3);
+ begin;
  insert into t1 values (2);
  analyze table t1;
  Table	Op	Msg_type	Msg_text
  test.t1	analyze	status	OK
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 -DATA_LENGTH / 16384
 -10.0000
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
 +CLUST_INDEX_SIZE
 +10
- delete from t1 where a=4;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
+ rollback;
  analyze table t1;
  Table	Op	Msg_type	Msg_text
  test.t1	analyze	status	OK
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 -DATA_LENGTH / 16384
 -8.0000
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
 +CLUST_INDEX_SIZE
 +8
- delete from t1 where a=5;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
+ rollback;
  analyze table t1;
  Table	Op	Msg_type	Msg_text
  test.t1	analyze	status	OK
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 -DATA_LENGTH / 16384
 -5.0000
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
 +CLUST_INDEX_SIZE
 +5
- set global innodb_limit_optimistic_insert_debug = 0;
- delete from t1 where a=2;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
+ set global innodb_limit_optimistic_insert_debug = 10000;
+ rollback;
  analyze table t1;
  Table	Op	Msg_type	Msg_text
  test.t1	analyze	status	OK
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 -DATA_LENGTH / 16384
 -3.0000
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
 +CLUST_INDEX_SIZE
 +3
+ begin;
  insert into t1 values (2);
- delete from t1 where a=2;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
+ rollback;
  analyze table t1;
  Table	Op	Msg_type	Msg_text
  test.t1	analyze	status	OK
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 -DATA_LENGTH / 16384
 -2.0000
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
 +CLUST_INDEX_SIZE
 +2
+ begin;
  insert into t1 values (2);
- delete from t1 where a=2;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
+ rollback;
  analyze table t1;
  Table	Op	Msg_type	Msg_text
  test.t1	analyze	status	OK
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 -DATA_LENGTH / 16384
 -1.0000
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
 +CLUST_INDEX_SIZE
 +1
  drop table t1;
+ set global innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug;
diff --cc mysql-test/suite/innodb/t/innodb_bug14676111.test
index 02ef5e5e7f0,10eb6a3b13c..3abc574a8d2
--- a/mysql-test/suite/innodb/t/innodb_bug14676111.test
+++ b/mysql-test/suite/innodb/t/innodb_bug14676111.test
@@@ -2,20 -2,11 +2,11 @@@
  
  -- source include/have_innodb.inc
  -- source include/have_debug.inc
+ -- source include/count_sessions.inc
  
- if (`select count(*)=0 from information_schema.global_variables where variable_name = 'INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG'`)
- {
-   --skip Test requires InnoDB built with UNIV_DEBUG definition.
- }
- 
- --disable_query_log
  set @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
- set @old_innodb_undo_logs = @@innodb_undo_logs;
- # Limit undo segments for stable progress of purge.
- set global innodb_undo_logs = 1;
- --enable_query_log
  
 -CREATE TABLE t1 (a int not null primary key) engine=InnoDB;
 +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
  
  #
  # make 4 leveled straight tree
@@@ -45,13 -43,15 +43,15 @@@ insert into t1 values (2)
  #  (1, 3) (4) (5)
  #(1, 2) (3) (4) (5)
  
+ --connection default
  analyze table t1;
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
  
- delete from t1 where a=4;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
- --source include/wait_innodb_all_purged.inc
+ --connection con4
+ rollback;
+ --disconnect con4
+ --connection default
+ 
  #deleting 1 record of 2 records don't cause merge artificially.
  #current tree form
  #      (1, 5)
@@@ -60,12 -60,13 +60,13 @@@
  #(1, 2) (3)     (5)
  
  analyze table t1;
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
  
- delete from t1 where a=5;
- set global innodb_purge_stop_now=ON;
- set global innodb_purge_run_now=ON;
- --source include/wait_innodb_all_purged.inc
+ --connection con5
+ rollback;
+ --disconnect con5
+ --connection default
+ 
  #deleting 1 record of 2 records don't cause merge artificially.
  #current tree form
  #      (1)
@@@ -93,8 -95,9 +95,9 @@@ rollback
  #  (1, 3)
  
  analyze table t1;
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
  
+ begin;
  insert into t1 values (2);
  #current tree form
  #      (1)
@@@ -110,8 -110,9 +110,9 @@@ rollback
  #    (1, 3)
  
  analyze table t1;
 -select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
 +select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME = 'test/t1';
  
+ begin;
  insert into t1 values (2);
  #current tree form
  #      (1)


More information about the commits mailing list