summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-06-15 18:02:57 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-06-15 18:06:55 +0300
commit43eec57fabc81304a4d3c5de7c2d18245b1cfdf6 (patch)
treec9c58115b8efa5bac523ca3333e39937fd37a5c9 /storage/xtradb/handler
parent765347384af7fd3393ad37567a612d93ed8b3d92 (diff)
parent6b71b3e3484818b667790b0f7426c37138fbbe53 (diff)
downloadmariadb-git-43eec57fabc81304a4d3c5de7c2d18245b1cfdf6.tar.gz
Merge 10.2 into bb-10.2-ext; also, fix MDEV-13015 After restart, InnoDB wrongly thinks that a SEQUENCE is a TABLE
sql_sequence.read_only: Show that the sequence can be read in both read-only and read-write mode, and that the sequence remains accessible after a server restart.
Diffstat (limited to 'storage/xtradb/handler')
-rw-r--r--storage/xtradb/handler/ha_innodb.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 28f5acb2dcc..ba426dd3d3b 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -6434,8 +6434,6 @@ table_opened:
innobase_copy_frm_flags_from_table_share(ib_table, table->s);
- ib_table->thd = (void*)thd;
-
/* No point to init any statistics if tablespace is still encrypted. */
if (ib_table->is_readable()) {
dict_stats_init(ib_table);