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
7fff6918
Commit
7fff6918
authored
Oct 15, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit_cache_norebuild(): Update table->fts->doc_col
parent
818ee0ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
11 deletions
+24
-11
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+24
-11
No files found.
storage/innobase/handler/handler0alter.cc
View file @
7fff6918
...
...
@@ -9606,17 +9606,30 @@ commit_cache_norebuild(
if
(
!
ctx
->
is_instant
())
{
innobase_rename_or_enlarge_columns_cache
(
ha_alter_info
,
table
,
ctx
->
new_table
);
}
else
if
(
ha_alter_info
->
handler_flags
&
ALTER_DROP_STORED_COLUMN
)
{
dict_index_t
*
index
=
dict_table_get_first_index
(
ctx
->
new_table
);
for
(
const
dict_field_t
*
f
=
index
->
fields
,
*
const
end
=
f
+
index
->
n_fields
;
f
!=
end
;
f
++
)
{
dict_col_t
&
c
=
*
f
->
col
;
if
(
c
.
is_dropped
())
{
c
.
set_dropped
(
!
c
.
is_nullable
(),
!
f
->
fixed_len
&&
c
.
len
>
255
,
f
->
fixed_len
);
}
else
{
if
(
fts_t
*
fts
=
ctx
->
new_table
->
fts
)
{
ut_ad
(
fts
->
doc_col
!=
ULINT_UNDEFINED
);
ut_ad
(
ctx
->
new_table
->
n_cols
>
DATA_N_SYS_COLS
);
unsigned
c
=
ctx
->
new_table
->
n_cols
-
(
DATA_N_SYS_COLS
+
1
);
ut_ad
(
ctx
->
new_table
->
cols
[
c
].
prtype
&
DATA_FTS_DOC_ID
);
fts
->
doc_col
=
c
;
}
if
(
ha_alter_info
->
handler_flags
&
ALTER_DROP_STORED_COLUMN
)
{
dict_index_t
*
index
=
dict_table_get_first_index
(
ctx
->
new_table
);
for
(
const
dict_field_t
*
f
=
index
->
fields
,
*
const
end
=
f
+
index
->
n_fields
;
f
!=
end
;
f
++
)
{
dict_col_t
&
c
=
*
f
->
col
;
if
(
c
.
is_dropped
())
{
c
.
set_dropped
(
!
c
.
is_nullable
(),
!
f
->
fixed_len
&&
c
.
len
>
255
,
f
->
fixed_len
);
}
}
}
}
...
...
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