Skip to content

Commit d520d35

Browse files
vuvovavuvova
committed
Revert "MDEV-8696: Adding indexes on empty table is slow with large innodb_sort_buffer_size."
This reverts commit 13884cf. Fixed in 5.6 (merged in the next commit)
1 parent 271fed4 commit d520d35

19 files changed

+42
-297
lines changed

‎mysql-test/suite/innodb/r/innodb-alter-filewrite.result

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎mysql-test/suite/innodb/r/innodb_monitor.result

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ os_log_bytes_written disabled
123123
os_log_fsyncs disabled
124124
os_log_pending_fsyncs disabled
125125
os_log_pending_writes disabled
126-
os_merge_blocks_written disabled
127-
os_merge_blocks_read disabled
128-
os_merge_blocks_merged disabled
129126
trx_rw_commits disabled
130127
trx_ro_commits disabled
131128
trx_nl_ro_commits disabled
@@ -257,9 +254,6 @@ lock_row_lock_time disabled
257254
lock_row_lock_time_max disabled
258255
lock_row_lock_waits disabled
259256
lock_row_lock_time_avg disabled
260-
os_merge_blocks_written disabled
261-
os_merge_blocks_read disabled
262-
os_merge_blocks_merged disabled
263257
innodb_rwlock_s_spin_waits disabled
264258
innodb_rwlock_x_spin_waits disabled
265259
innodb_rwlock_s_spin_rounds disabled
@@ -298,9 +292,6 @@ os_log_bytes_written disabled
298292
os_log_fsyncs disabled
299293
os_log_pending_fsyncs enabled
300294
os_log_pending_writes enabled
301-
os_merge_blocks_written disabled
302-
os_merge_blocks_read disabled
303-
os_merge_blocks_merged disabled
304295
set global innodb_monitor_enable="";
305296
ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
306297
set global innodb_monitor_enable="_";

‎mysql-test/suite/innodb/t/innodb-alter-filewrite.test

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ os_log_bytes_written disabled
123123
os_log_fsyncs disabled
124124
os_log_pending_fsyncs disabled
125125
os_log_pending_writes disabled
126-
os_merge_blocks_written disabled
127-
os_merge_blocks_read disabled
128-
os_merge_blocks_merged disabled
129126
trx_rw_commits disabled
130127
trx_ro_commits disabled
131128
trx_nl_ro_commits disabled
@@ -257,9 +254,6 @@ lock_row_lock_time disabled
257254
lock_row_lock_time_max disabled
258255
lock_row_lock_waits disabled
259256
lock_row_lock_time_avg disabled
260-
os_merge_blocks_written disabled
261-
os_merge_blocks_read disabled
262-
os_merge_blocks_merged disabled
263257
innodb_rwlock_s_spin_waits disabled
264258
innodb_rwlock_x_spin_waits disabled
265259
innodb_rwlock_s_spin_rounds disabled
@@ -298,9 +292,6 @@ os_log_bytes_written disabled
298292
os_log_fsyncs disabled
299293
os_log_pending_fsyncs enabled
300294
os_log_pending_writes enabled
301-
os_merge_blocks_written disabled
302-
os_merge_blocks_read disabled
303-
os_merge_blocks_merged disabled
304295
set global innodb_monitor_enable="";
305296
ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
306297
set global innodb_monitor_enable="_";

‎mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ os_log_bytes_written disabled
123123
os_log_fsyncs disabled
124124
os_log_pending_fsyncs disabled
125125
os_log_pending_writes disabled
126-
os_merge_blocks_written disabled
127-
os_merge_blocks_read disabled
128-
os_merge_blocks_merged disabled
129126
trx_rw_commits disabled
130127
trx_ro_commits disabled
131128
trx_nl_ro_commits disabled
@@ -257,9 +254,6 @@ lock_row_lock_time disabled
257254
lock_row_lock_time_max disabled
258255
lock_row_lock_waits disabled
259256
lock_row_lock_time_avg disabled
260-
os_merge_blocks_written disabled
261-
os_merge_blocks_read disabled
262-
os_merge_blocks_merged disabled
263257
innodb_rwlock_s_spin_waits disabled
264258
innodb_rwlock_x_spin_waits disabled
265259
innodb_rwlock_s_spin_rounds disabled
@@ -298,9 +292,6 @@ os_log_bytes_written disabled
298292
os_log_fsyncs disabled
299293
os_log_pending_fsyncs enabled
300294
os_log_pending_writes enabled
301-
os_merge_blocks_written disabled
302-
os_merge_blocks_read disabled
303-
os_merge_blocks_merged disabled
304295
set global innodb_monitor_enable="";
305296
ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
306297
set global innodb_monitor_enable="_";

‎mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ os_log_bytes_written disabled
123123
os_log_fsyncs disabled
124124
os_log_pending_fsyncs disabled
125125
os_log_pending_writes disabled
126-
os_merge_blocks_written disabled
127-
os_merge_blocks_read disabled
128-
os_merge_blocks_merged disabled
129126
trx_rw_commits disabled
130127
trx_ro_commits disabled
131128
trx_nl_ro_commits disabled
@@ -257,9 +254,6 @@ lock_row_lock_time disabled
257254
lock_row_lock_time_max disabled
258255
lock_row_lock_waits disabled
259256
lock_row_lock_time_avg disabled
260-
os_merge_blocks_written disabled
261-
os_merge_blocks_read disabled
262-
os_merge_blocks_merged disabled
263257
innodb_rwlock_s_spin_waits disabled
264258
innodb_rwlock_x_spin_waits disabled
265259
innodb_rwlock_s_spin_rounds disabled
@@ -298,9 +292,6 @@ os_log_bytes_written disabled
298292
os_log_fsyncs disabled
299293
os_log_pending_fsyncs enabled
300294
os_log_pending_writes enabled
301-
os_merge_blocks_written disabled
302-
os_merge_blocks_read disabled
303-
os_merge_blocks_merged disabled
304295
set global innodb_monitor_enable="";
305296
ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
306297
set global innodb_monitor_enable="_";

‎mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ os_log_bytes_written disabled
123123
os_log_fsyncs disabled
124124
os_log_pending_fsyncs disabled
125125
os_log_pending_writes disabled
126-
os_merge_blocks_written disabled
127-
os_merge_blocks_read disabled
128-
os_merge_blocks_merged disabled
129126
trx_rw_commits disabled
130127
trx_ro_commits disabled
131128
trx_nl_ro_commits disabled
@@ -257,9 +254,6 @@ lock_row_lock_time disabled
257254
lock_row_lock_time_max disabled
258255
lock_row_lock_waits disabled
259256
lock_row_lock_time_avg disabled
260-
os_merge_blocks_written disabled
261-
os_merge_blocks_read disabled
262-
os_merge_blocks_merged disabled
263257
innodb_rwlock_s_spin_waits disabled
264258
innodb_rwlock_x_spin_waits disabled
265259
innodb_rwlock_s_spin_rounds disabled
@@ -298,9 +292,6 @@ os_log_bytes_written disabled
298292
os_log_fsyncs disabled
299293
os_log_pending_fsyncs enabled
300294
os_log_pending_writes enabled
301-
os_merge_blocks_written disabled
302-
os_merge_blocks_read disabled
303-
os_merge_blocks_merged disabled
304295
set global innodb_monitor_enable="";
305296
ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
306297
set global innodb_monitor_enable="_";

‎storage/innobase/handler/ha_innodb.cc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (c) 2000, 2015, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2008, 2009 Google Inc.
55
Copyright (c) 2009, Percona Inc.
66
Copyright (c) 2012, Facebook Inc.
7-
Copyright (c) 2013, 2015, MariaDB Corporation.
7+
Copyright (c) 2013, 2014 SkySQL Ab. All Rights Reserved.
88

99
Portions of this file contain modifications contributed and copyrighted by
1010
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -647,12 +647,6 @@ static SHOW_VAR innodb_status_variables[]= {
647647
(char*) &export_vars.innodb_os_log_pending_writes, SHOW_LONG},
648648
{"os_log_written",
649649
(char*) &export_vars.innodb_os_log_written, SHOW_LONGLONG},
650-
{"os_merge_buffers_written",
651-
(char*) &export_vars.innodb_merge_buffers_written, SHOW_LONGLONG},
652-
{"os_merge_buffers_read",
653-
(char*) &export_vars.innodb_merge_buffers_read, SHOW_LONGLONG},
654-
{"os_merge_buffers_merged",
655-
(char*) &export_vars.innodb_merge_buffers_merged, SHOW_LONGLONG},
656650
{"page_size",
657651
(char*) &export_vars.innodb_page_size, SHOW_LONG},
658652
{"pages_created",

‎storage/innobase/include/srv0mon.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
33
Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2012, Facebook Inc.
5-
Copyright (c) 2014, 2015, MariaDB Corporation.
65
76
This program is free software; you can redistribute it and/or modify it
87
under the terms of the GNU General Public License as published by the
@@ -256,9 +255,6 @@ enum monitor_id_t {
256255
MONITOR_OVLD_OS_LOG_FSYNC,
257256
MONITOR_OVLD_OS_LOG_PENDING_FSYNC,
258257
MONITOR_OVLD_OS_LOG_PENDING_WRITES,
259-
MONITOR_MERGE_BLOCKS_WRITTEN,
260-
MONITOR_MERGE_BLOCKS_READ,
261-
MONITOR_MERGE_BLOCKS_MERGED,
262258

263259
/* Transaction related counters */
264260
MONITOR_MODULE_TRX,

‎storage/innobase/include/srv0srv.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
44
Copyright (c) 2008, 2009, Google Inc.
55
Copyright (c) 2009, Percona Inc.
6-
Copyright (c) 2013, 2015, MariaDB Corporation.
6+
Copyright (c) 2013, 2014, SkySQL Ab. All Rights Reserved.
77
88
Portions of this file contain modifications contributed and copyrighted by
99
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -138,15 +138,6 @@ struct srv_stats_t {
138138

139139
/** Number of system rows inserted */
140140
ulint_ctr_64_t n_system_rows_inserted;
141-
142-
/** Number of merge buffers written */
143-
ulint_ctr_64_t merge_buffers_written;
144-
145-
/** Number of merge buffers read */
146-
ulint_ctr_64_t merge_buffers_read;
147-
148-
/** Number of merge buffers merged */
149-
ulint_ctr_64_t merge_buffers_merged;
150141
};
151142

152143
extern const char* srv_main_thread_op_info;
@@ -886,9 +877,6 @@ struct export_var_t{
886877
ulint innodb_purge_view_trx_id_age; /*!< rw_max_trx_id
887878
- purged view's min trx_id */
888879
#endif /* UNIV_DEBUG */
889-
ib_int64_t innodb_merge_buffers_written;
890-
ib_int64_t innodb_merge_buffers_read;
891-
ib_int64_t innodb_merge_buffers_merged;
892880
};
893881

894882
/** Thread slot in the thread table. */

0 commit comments

Comments
 (0)