Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
cdc8debc
Commit
cdc8debc
authored
Aug 21, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
MDEV-16557 Remove INNOBASE_SHARE
parents
cccdb176
1a7a0189
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
402 deletions
+32
-402
storage/innobase/dict/dict0dict.cc
storage/innobase/dict/dict0dict.cc
+1
-1
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+31
-341
storage/innobase/handler/ha_innodb.h
storage/innobase/handler/ha_innodb.h
+0
-43
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+0
-6
storage/innobase/row/row0merge.cc
storage/innobase/row/row0merge.cc
+0
-11
No files found.
storage/innobase/dict/dict0dict.cc
View file @
cdc8debc
...
@@ -6224,7 +6224,7 @@ dict_table_get_index_on_name(
...
@@ -6224,7 +6224,7 @@ dict_table_get_index_on_name(
while
(
index
!=
NULL
)
{
while
(
index
!=
NULL
)
{
if
(
index
->
is_committed
()
==
committed
if
(
index
->
is_committed
()
==
committed
&&
innobase_strcase
cmp
(
index
->
name
,
name
)
==
0
)
{
&&
str
cmp
(
index
->
name
,
name
)
==
0
)
{
return
(
index
);
return
(
index
);
}
}
...
...
storage/innobase/handler/ha_innodb.cc
View file @
cdc8debc
This diff is collapsed.
Click to expand it.
storage/innobase/handler/ha_innodb.h
View file @
cdc8debc
...
@@ -23,35 +23,6 @@ this program; if not, write to the Free Software Foundation, Inc.,
...
@@ -23,35 +23,6 @@ this program; if not, write to the Free Software Foundation, Inc.,
system clustered index when there is no primary key. */
system clustered index when there is no primary key. */
extern
const
char
innobase_index_reserve_name
[];
extern
const
char
innobase_index_reserve_name
[];
/* Structure defines translation table between mysql index and InnoDB
index structures */
struct
innodb_idx_translate_t
{
ulint
index_count
;
/*!< number of valid index entries
in the index_mapping array */
ulint
array_size
;
/*!< array size of index_mapping */
dict_index_t
**
index_mapping
;
/*!< index pointer array directly
maps to index in InnoDB from MySQL
array index */
};
/** InnoDB table share */
typedef
struct
st_innobase_share
{
THR_LOCK
lock
;
const
char
*
table_name
;
/*!< InnoDB table name */
uint
use_count
;
/*!< reference count,
incremented in get_share()
and decremented in
free_share() */
void
*
table_name_hash
;
/*!< hash table chain node */
innodb_idx_translate_t
idx_trans_tbl
;
/*!< index translation table between
MySQL and InnoDB */
}
INNOBASE_SHARE
;
/** Prebuilt structures in an InnoDB table handle used within MySQL */
/** Prebuilt structures in an InnoDB table handle used within MySQL */
struct
row_prebuilt_t
;
struct
row_prebuilt_t
;
...
@@ -492,9 +463,6 @@ class ha_innobase: public handler
...
@@ -492,9 +463,6 @@ class ha_innobase: public handler
THR_LOCK_DATA
lock
;
THR_LOCK_DATA
lock
;
/** information for MySQL table locking */
INNOBASE_SHARE
*
m_share
;
/** buffer used in updates */
/** buffer used in updates */
uchar
*
m_upd_buf
;
uchar
*
m_upd_buf
;
...
@@ -631,17 +599,6 @@ trx_t*
...
@@ -631,17 +599,6 @@ trx_t*
innobase_trx_allocate
(
innobase_trx_allocate
(
MYSQL_THD
thd
);
/*!< in: user thread handle */
MYSQL_THD
thd
);
/*!< in: user thread handle */
/** Match index columns between MySQL and InnoDB.
This function checks whether the index column information
is consistent between KEY info from mysql and that from innodb index.
@param[in] key_info Index info from mysql
@param[in] index_info Index info from InnoDB
@return true if all column types match. */
bool
innobase_match_index_columns
(
const
KEY
*
key_info
,
const
dict_index_t
*
index_info
);
/*********************************************************************//**
/*********************************************************************//**
This function checks each index name for a table against reserved
This function checks each index name for a table against reserved
system default primary index name 'GEN_CLUST_INDEX'. If a name
system default primary index name 'GEN_CLUST_INDEX'. If a name
...
...
storage/innobase/handler/handler0alter.cc
View file @
cdc8debc
...
@@ -8883,12 +8883,6 @@ ha_innobase::commit_inplace_alter_table(
...
@@ -8883,12 +8883,6 @@ ha_innobase::commit_inplace_alter_table(
log_append_on_checkpoint
(
NULL
);
log_append_on_checkpoint
(
NULL
);
/* Invalidate the index translation table. In partitioned
tables, there is no share. */
if
(
m_share
)
{
m_share
->
idx_trans_tbl
.
index_count
=
0
;
}
/* Tell the InnoDB server that there might be work for
/* Tell the InnoDB server that there might be work for
utility threads: */
utility threads: */
...
...
storage/innobase/row/row0merge.cc
View file @
cdc8debc
...
@@ -3791,17 +3791,6 @@ row_merge_drop_indexes(
...
@@ -3791,17 +3791,6 @@ row_merge_drop_indexes(
ut_ad
(
prev
);
ut_ad
(
prev
);
ut_a
(
table
->
fts
);
ut_a
(
table
->
fts
);
fts_drop_index
(
table
,
index
,
trx
);
fts_drop_index
(
table
,
index
,
trx
);
/* Since
INNOBASE_SHARE::idx_trans_tbl
is shared between all open
ha_innobase handles to this
table, no thread should be
accessing this dict_index_t
object. Also, we should be
holding LOCK=SHARED MDL on the
table even after the MDL
upgrade timeout. */
/* We can remove a DICT_FTS
/* We can remove a DICT_FTS
index from the cache, because
index from the cache, because
we do not allow ADD FULLTEXT INDEX
we do not allow ADD FULLTEXT INDEX
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment