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
0474be0a
Commit
0474be0a
authored
Jan 18, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.3 into 10.4
parents
937c90ce
4e75bfcb
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
83 additions
and
79 deletions
+83
-79
mysql-test/main/innodb_mysql_sync.result
mysql-test/main/innodb_mysql_sync.result
+3
-1
mysql-test/main/innodb_mysql_sync.test
mysql-test/main/innodb_mysql_sync.test
+1
-1
mysql-test/suite/innodb/r/innodb-alter.result
mysql-test/suite/innodb/r/innodb-alter.result
+6
-8
mysql-test/suite/innodb/t/innodb-alter.test
mysql-test/suite/innodb/t/innodb-alter.test
+0
-5
mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
+10
-1
mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
+10
-0
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+3
-2
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+41
-45
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+5
-2
storage/innobase/row/row0sel.cc
storage/innobase/row/row0sel.cc
+4
-14
No files found.
mysql-test/main/innodb_mysql_sync.result
View file @
0474be0a
...
@@ -489,7 +489,9 @@ DROP TABLE t1;
...
@@ -489,7 +489,9 @@ DROP TABLE t1;
SET DEBUG_SYNC= 'alter_table_copy_after_lock_upgrade SIGNAL upgraded';
SET DEBUG_SYNC= 'alter_table_copy_after_lock_upgrade SIGNAL upgraded';
#Setup a table with FULLTEXT index.
#Setup a table with FULLTEXT index.
connection default;
connection default;
CREATE TABLE t1(fld1 CHAR(10), FULLTEXT(fld1)) ENGINE= INNODB;
CREATE TABLE t1(fld1 CHAR(10), FULLTEXT(fld1), FULLTEXT(fld1)) ENGINE= INNODB;
Warnings:
Note 1831 Duplicate index `fld1_2`. This is deprecated and will be disallowed in a future release
INSERT INTO t1 VALUES("String1");
INSERT INTO t1 VALUES("String1");
#OPTIMIZE TABLE operation.
#OPTIMIZE TABLE operation.
OPTIMIZE TABLE t1;
OPTIMIZE TABLE t1;
...
...
mysql-test/main/innodb_mysql_sync.test
View file @
0474be0a
...
@@ -650,7 +650,7 @@ SET DEBUG_SYNC= 'alter_table_copy_after_lock_upgrade SIGNAL upgraded';
...
@@ -650,7 +650,7 @@ SET DEBUG_SYNC= 'alter_table_copy_after_lock_upgrade SIGNAL upgraded';
--
echo
#Setup a table with FULLTEXT index.
--
echo
#Setup a table with FULLTEXT index.
--
connection
default
--
connection
default
CREATE
TABLE
t1
(
fld1
CHAR
(
10
),
FULLTEXT
(
fld1
))
ENGINE
=
INNODB
;
CREATE
TABLE
t1
(
fld1
CHAR
(
10
),
FULLTEXT
(
fld1
)
,
FULLTEXT
(
fld1
)
)
ENGINE
=
INNODB
;
INSERT
INTO
t1
VALUES
(
"String1"
);
INSERT
INTO
t1
VALUES
(
"String1"
);
--
echo
#OPTIMIZE TABLE operation.
--
echo
#OPTIMIZE TABLE operation.
...
...
mysql-test/suite/innodb/r/innodb-alter.result
View file @
0474be0a
...
@@ -439,17 +439,17 @@ tt CREATE TABLE `tt` (
...
@@ -439,17 +439,17 @@ tt CREATE TABLE `tt` (
FULLTEXT KEY `ct` (`ct`)
FULLTEXT KEY `ct` (`ct`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE;
ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE;
ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
CREATE TABLE tu (
CREATE TABLE tu (
pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT,
pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT,
FULLTEXT INDEX(t)
FULLTEXT INDEX(t)
) ENGINE=InnoDB;
) ENGINE=InnoDB;
ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE;
ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE;
ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
DROP TABLE tu;
DROP TABLE tu;
CREATE TABLE tv (
CREATE TABLE tv (
pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT,
pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT,
...
@@ -457,9 +457,9 @@ UNIQUE INDEX FTS_DOC_ID_INDEX(FTS_DOC_ID),
...
@@ -457,9 +457,9 @@ UNIQUE INDEX FTS_DOC_ID_INDEX(FTS_DOC_ID),
FULLTEXT INDEX(t)
FULLTEXT INDEX(t)
) ENGINE=InnoDB;
) ENGINE=InnoDB;
ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE;
ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE;
ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
DROP TABLE tv;
DROP TABLE tv;
ALTER TABLE t1o CHANGE c1 dB_row_Id INT, ALGORITHM=COPY;
ALTER TABLE t1o CHANGE c1 dB_row_Id INT, ALGORITHM=COPY;
ERROR 42000: Incorrect column name 'dB_row_Id'
ERROR 42000: Incorrect column name 'dB_row_Id'
...
@@ -500,8 +500,6 @@ ADD COLUMN FTS_DOC_ID BIGINT UNSIGNED NOT NULL, ALGORITHM=INPLACE;
...
@@ -500,8 +500,6 @@ ADD COLUMN FTS_DOC_ID BIGINT UNSIGNED NOT NULL, ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
ALTER TABLE t1o ADD COLUMN FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
ALTER TABLE t1o ADD COLUMN FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
ALGORITHM=INPLACE;
ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
ALTER TABLE t1o ADD COLUMN FTS_DOC_ID BIGINT UNSIGNED NOT NULL;
ALTER TABLE t1o DROP COLUMN FTS_DOC_ID, ALGORITHM=INPLACE;
ALTER TABLE t1o DROP COLUMN FTS_DOC_ID, ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot drop or rename FTS_DOC_ID. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot drop or rename FTS_DOC_ID. Try ALGORITHM=COPY
ALTER TABLE t1o DROP COLUMN FTS_DOC_ID;
ALTER TABLE t1o DROP COLUMN FTS_DOC_ID;
...
...
mysql-test/suite/innodb/t/innodb-alter.test
View file @
0474be0a
...
@@ -272,13 +272,8 @@ ALTER TABLE t1o ADD FULLTEXT INDEX(cu),
...
@@ -272,13 +272,8 @@ ALTER TABLE t1o ADD FULLTEXT INDEX(cu),
ADD
COLUMN
FTS_DOC_ID
BIGINT
UNSIGNED
NOT
NULL
,
ALGORITHM
=
INPLACE
;
ADD
COLUMN
FTS_DOC_ID
BIGINT
UNSIGNED
NOT
NULL
,
ALGORITHM
=
INPLACE
;
# Replace the hidden FTS_DOC_ID column with a user-visible one.
# Replace the hidden FTS_DOC_ID column with a user-visible one.
# This used to work if there is at most one fulltext index.
# Currently, we disallow native ALTER TABLE if the table
# contains any FULLTEXT indexes.
--
error
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
ALTER
TABLE
t1o
ADD
COLUMN
FTS_DOC_ID
BIGINT
UNSIGNED
NOT
NULL
,
ALTER
TABLE
t1o
ADD
COLUMN
FTS_DOC_ID
BIGINT
UNSIGNED
NOT
NULL
,
ALGORITHM
=
INPLACE
;
ALGORITHM
=
INPLACE
;
ALTER
TABLE
t1o
ADD
COLUMN
FTS_DOC_ID
BIGINT
UNSIGNED
NOT
NULL
;
# Replace the user-visible FTS_DOC_ID column with a hidden one.
# Replace the user-visible FTS_DOC_ID column with a hidden one.
# We do not support this in-place.
# We do not support this in-place.
--
error
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
--
error
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
...
...
mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
View file @
0474be0a
...
@@ -79,7 +79,7 @@ CREATE FULLTEXT INDEX idx on fts_test (title, body) LOCK=NONE;
...
@@ -79,7 +79,7 @@ CREATE FULLTEXT INDEX idx on fts_test (title, body) LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, LOCK=NONE;
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, LOCK=NONE;
ERROR 0A000: LOCK=NONE is not supported. Reason:
InnoDB presently supports one FULLTEXT index creation at a time
. Try LOCK=SHARED
ERROR 0A000: LOCK=NONE is not supported. Reason:
Fulltext index creation requires a lock
. Try LOCK=SHARED
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT;
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT;
SELECT * FROM fts_test WHERE MATCH (title, body)
SELECT * FROM fts_test WHERE MATCH (title, body)
AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);
AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);
...
@@ -228,3 +228,12 @@ DROP TABLE articles;
...
@@ -228,3 +228,12 @@ DROP TABLE articles;
CREATE TABLE t1 (a VARCHAR(3)) ENGINE=InnoDB;
CREATE TABLE t1 (a VARCHAR(3)) ENGINE=InnoDB;
ALTER TABLE t1 ADD FULLTEXT KEY(a), ADD COLUMN b VARCHAR(3), ADD FULLTEXT KEY(b);
ALTER TABLE t1 ADD FULLTEXT KEY(a), ADD COLUMN b VARCHAR(3), ADD FULLTEXT KEY(b);
DROP TABLE t1;
DROP TABLE t1;
#
# MDEV-18152 Assertion 'num_fts_index <= 1' failed
# in prepare_inplace_alter_table_dict
#
CREATE TABLE t1
(a VARCHAR(128), b VARCHAR(128), FULLTEXT INDEX(a), FULLTEXT INDEX(b))
ENGINE=InnoDB;
ALTER TABLE t1 ADD c SERIAL;
DROP TABLE t1;
mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
View file @
0474be0a
...
@@ -276,3 +276,13 @@ ALTER TABLE t1 ADD FULLTEXT KEY(a), ADD COLUMN b VARCHAR(3), ADD FULLTEXT KEY(b)
...
@@ -276,3 +276,13 @@ ALTER TABLE t1 ADD FULLTEXT KEY(a), ADD COLUMN b VARCHAR(3), ADD FULLTEXT KEY(b)
# Cleanup
# Cleanup
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# MDEV-18152 Assertion 'num_fts_index <= 1' failed
--
echo
# in prepare_inplace_alter_table_dict
--
echo
#
CREATE
TABLE
t1
(
a
VARCHAR
(
128
),
b
VARCHAR
(
128
),
FULLTEXT
INDEX
(
a
),
FULLTEXT
INDEX
(
b
))
ENGINE
=
InnoDB
;
ALTER
TABLE
t1
ADD
c
SERIAL
;
DROP
TABLE
t1
;
storage/innobase/handler/ha_innodb.cc
View file @
0474be0a
...
@@ -290,11 +290,12 @@ thd_destructor_proxy(void *)
...
@@ -290,11 +290,12 @@ thd_destructor_proxy(void *)
mysql_cond_init
(
PSI_NOT_INSTRUMENTED
,
&
thd_destructor_cond
,
0
);
mysql_cond_init
(
PSI_NOT_INSTRUMENTED
,
&
thd_destructor_cond
,
0
);
st_my_thread_var
*
myvar
=
_my_thread_var
();
st_my_thread_var
*
myvar
=
_my_thread_var
();
myvar
->
current_mutex
=
&
thd_destructor_mutex
;
myvar
->
current_cond
=
&
thd_destructor_cond
;
THD
*
thd
=
create_thd
();
THD
*
thd
=
create_thd
();
thd_proc_info
(
thd
,
"InnoDB shutdown handler"
);
thd_proc_info
(
thd
,
"InnoDB shutdown handler"
);
myvar
->
current_mutex
=
&
thd_destructor_mutex
;
myvar
->
current_cond
=
&
thd_destructor_cond
;
mysql_mutex_lock
(
&
thd_destructor_mutex
);
mysql_mutex_lock
(
&
thd_destructor_mutex
);
srv_running
.
store
(
myvar
,
std
::
memory_order_relaxed
);
srv_running
.
store
(
myvar
,
std
::
memory_order_relaxed
);
...
...
storage/innobase/handler/handler0alter.cc
View file @
0474be0a
...
@@ -1242,20 +1242,18 @@ my_error_innodb(
...
@@ -1242,20 +1242,18 @@ my_error_innodb(
/** Determine if fulltext indexes exist in a given table.
/** Determine if fulltext indexes exist in a given table.
@param table MySQL table
@param table MySQL table
@return whether fulltext indexes exist on the table */
@return number of fulltext indexes */
static
static
uint
innobase_fulltext_exist
(
const
TABLE
*
table
)
bool
innobase_fulltext_exist
(
/*====================*/
const
TABLE
*
table
)
{
{
uint
count
=
0
;
for
(
uint
i
=
0
;
i
<
table
->
s
->
keys
;
i
++
)
{
for
(
uint
i
=
0
;
i
<
table
->
s
->
keys
;
i
++
)
{
if
(
table
->
key_info
[
i
].
flags
&
HA_FULLTEXT
)
{
if
(
table
->
key_info
[
i
].
flags
&
HA_FULLTEXT
)
{
return
(
true
)
;
count
++
;
}
}
}
}
return
(
false
)
;
return
count
;
}
}
/** Determine whether indexed virtual columns exist in a table.
/** Determine whether indexed virtual columns exist in a table.
...
@@ -1807,11 +1805,14 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -1807,11 +1805,14 @@ ha_innobase::check_if_supported_inplace_alter(
DBUG_RETURN
(
HA_ALTER_INPLACE_NOT_SUPPORTED
);
DBUG_RETURN
(
HA_ALTER_INPLACE_NOT_SUPPORTED
);
}
}
const
char
*
reason_rebuild
=
NULL
;
switch
(
ha_alter_info
->
handler_flags
&
~
INNOBASE_INPLACE_IGNORE
)
{
switch
(
ha_alter_info
->
handler_flags
&
~
INNOBASE_INPLACE_IGNORE
)
{
case
ALTER_OPTIONS
:
case
ALTER_OPTIONS
:
if
(
alter_options_need_rebuild
(
ha_alter_info
,
table
))
{
if
(
alter_options_need_rebuild
(
ha_alter_info
,
table
))
{
ha_alter_info
->
unsupported_reason
=
my_get_err_msg
(
reason_rebuild
=
my_get_err_msg
(
ER_ALTER_OPERATION_TABLE_OPTIONS_NEED_REBUILD
);
ER_ALTER_OPERATION_TABLE_OPTIONS_NEED_REBUILD
);
ha_alter_info
->
unsupported_reason
=
reason_rebuild
;
break
;
break
;
}
}
/* fall through */
/* fall through */
...
@@ -1946,8 +1947,9 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -1946,8 +1947,9 @@ ha_innobase::check_if_supported_inplace_alter(
}
}
/* We should be able to do the operation in-place.
/* We should be able to do the operation in-place.
See if we can do it online (LOCK=NONE). */
See if we can do it online (LOCK=NONE) or without rebuild. */
bool
online
=
true
;
bool
online
=
true
,
need_rebuild
=
false
;
const
uint
fulltext_indexes
=
innobase_fulltext_exist
(
altered_table
);
List_iterator_fast
<
Create_field
>
cf_it
(
List_iterator_fast
<
Create_field
>
cf_it
(
ha_alter_info
->
alter_info
->
create_list
);
ha_alter_info
->
alter_info
->
create_list
);
...
@@ -2008,8 +2010,7 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2008,8 +2010,7 @@ ha_innobase::check_if_supported_inplace_alter(
/* We cannot replace a hidden FTS_DOC_ID
/* We cannot replace a hidden FTS_DOC_ID
with a user-visible FTS_DOC_ID. */
with a user-visible FTS_DOC_ID. */
if
(
m_prebuilt
->
table
->
fts
if
(
fulltext_indexes
&&
m_prebuilt
->
table
->
fts
&&
innobase_fulltext_exist
(
altered_table
)
&&
!
my_strcasecmp
(
&&
!
my_strcasecmp
(
system_charset_info
,
system_charset_info
,
key_part
->
field
->
field_name
.
str
,
key_part
->
field
->
field_name
.
str
,
...
@@ -2025,8 +2026,8 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2025,8 +2026,8 @@ ha_innobase::check_if_supported_inplace_alter(
&
AUTO_INCREMENT_FLAG
));
&
AUTO_INCREMENT_FLAG
));
if
(
key_part
->
field
->
flags
&
AUTO_INCREMENT_FLAG
)
{
if
(
key_part
->
field
->
flags
&
AUTO_INCREMENT_FLAG
)
{
/* We cannot assign
an AUTO_INCREMENT
/* We cannot assign
AUTO_INCREMENT values
column values during online
ALTER. */
during online or instant
ALTER. */
DBUG_ASSERT
(
key_part
->
field
==
altered_table
DBUG_ASSERT
(
key_part
->
field
==
altered_table
->
found_next_number_field
);
->
found_next_number_field
);
...
@@ -2036,6 +2037,7 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2036,6 +2037,7 @@ ha_innobase::check_if_supported_inplace_alter(
}
}
online
=
false
;
online
=
false
;
need_rebuild
=
true
;
}
}
if
(
innobase_is_v_fld
(
key_part
->
field
))
{
if
(
innobase_is_v_fld
(
key_part
->
field
))
{
...
@@ -2068,7 +2070,7 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2068,7 +2070,7 @@ ha_innobase::check_if_supported_inplace_alter(
||
(
m_prebuilt
->
table
->
fts
->
doc_col
||
(
m_prebuilt
->
table
->
fts
->
doc_col
<
dict_table_get_n_user_cols
(
m_prebuilt
->
table
)));
<
dict_table_get_n_user_cols
(
m_prebuilt
->
table
)));
if
(
m_prebuilt
->
table
->
fts
&&
innobase_fulltext_exist
(
altered_table
)
)
{
if
(
fulltext_indexes
&&
m_prebuilt
->
table
->
fts
)
{
/* FULLTEXT indexes are supposed to remain. */
/* FULLTEXT indexes are supposed to remain. */
/* Disallow DROP INDEX FTS_DOC_ID_INDEX */
/* Disallow DROP INDEX FTS_DOC_ID_INDEX */
...
@@ -2113,7 +2115,8 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2113,7 +2115,8 @@ ha_innobase::check_if_supported_inplace_alter(
cf_it
.
rewind
();
cf_it
.
rewind
();
Field
**
af
=
altered_table
->
field
;
Field
**
af
=
altered_table
->
field
;
bool
fts_need_rebuild
=
false
;
bool
fts_need_rebuild
=
false
;
const
bool
need_rebuild
=
innobase_need_rebuild
(
ha_alter_info
,
table
);
need_rebuild
=
need_rebuild
||
innobase_need_rebuild
(
ha_alter_info
,
table
);
while
(
Create_field
*
cf
=
cf_it
++
)
{
while
(
Create_field
*
cf
=
cf_it
++
)
{
DBUG_ASSERT
(
cf
->
field
DBUG_ASSERT
(
cf
->
field
...
@@ -2165,8 +2168,7 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2165,8 +2168,7 @@ ha_innobase::check_if_supported_inplace_alter(
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL
);
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL
);
}
else
if
(
!
is_non_const_value
(
*
af
)
}
else
if
(
!
is_non_const_value
(
*
af
)
&&
set_default_value
(
*
af
))
{
&&
set_default_value
(
*
af
))
{
if
(
m_prebuilt
->
table
->
fts
if
(
fulltext_indexes
>
1
&&
innobase_fulltext_exist
(
altered_table
)
&&
!
my_strcasecmp
(
system_charset_info
,
&&
!
my_strcasecmp
(
system_charset_info
,
(
*
af
)
->
field_name
.
str
,
(
*
af
)
->
field_name
.
str
,
FTS_DOC_ID_COL_NAME
))
{
FTS_DOC_ID_COL_NAME
))
{
...
@@ -2189,42 +2191,36 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2189,42 +2191,36 @@ ha_innobase::check_if_supported_inplace_alter(
DBUG_RETURN
(
HA_ALTER_INPLACE_INSTANT
);
DBUG_RETURN
(
HA_ALTER_INPLACE_INSTANT
);
}
}
if
(
!
online
)
{
if
(
need_rebuild
/* We already determined that only a non-locking
&&
(
fulltext_indexes
operation is possible. */
||
innobase_spatial_exist
(
altered_table
)
}
else
if
((
need_rebuild
||
(
ha_alter_info
->
handler_flags
||
innobase_indexed_virtual_exist
(
altered_table
)))
{
&
ALTER_ADD_PK_INDEX
))
&&
(
innobase_fulltext_exist
(
altered_table
)
||
innobase_spatial_exist
(
altered_table
)
||
innobase_indexed_virtual_exist
(
altered_table
)))
{
/* Refuse to rebuild the table online, if
FULLTEXT OR SPATIAL indexes are to survive the rebuild. */
online
=
false
;
/* If the table already contains fulltext indexes,
/* If the table already contains fulltext indexes,
refuse to rebuild the table natively altogether. */
refuse to rebuild the table natively altogether. */
if
(
m_prebuilt
->
table
->
fts
)
{
if
(
fulltext_indexes
>
1
)
{
cannot_create_many_fulltext_index:
cannot_create_many_fulltext_index:
ha_alter_info
->
unsupported_reason
=
ha_alter_info
->
unsupported_reason
=
my_get_err_msg
(
ER_INNODB_FT_LIMIT
);
my_get_err_msg
(
ER_INNODB_FT_LIMIT
);
DBUG_RETURN
(
HA_ALTER_INPLACE_NOT_SUPPORTED
);
DBUG_RETURN
(
HA_ALTER_INPLACE_NOT_SUPPORTED
);
}
}
if
(
ha_alter_info
->
online
if
(
!
online
||
!
ha_alter_info
->
online
&&
!
ha_alter_info
->
unsupported_reason
)
{
||
ha_alter_info
->
unsupported_reason
!=
reason_rebuild
)
{
/* Either LOCK=NONE was not requested, or we already
if
(
innobase_spatial_exist
(
altered_table
))
{
gave specific reason to refuse it. */
ha_alter_info
->
unsupported_reason
=
my_get_err_msg
(
}
else
if
(
fulltext_indexes
)
{
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS
);
ha_alter_info
->
unsupported_reason
=
my_get_err_msg
(
}
else
if
(
!
innobase_fulltext_exist
(
altered_table
))
{
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS
);
/* MDEV-14341 FIXME: Remove this limitation. */
}
else
if
(
innobase_spatial_exist
(
altered_table
))
{
ha_alter_info
->
unsupported_reason
=
ha_alter_info
->
unsupported_reason
=
my_get_err_msg
(
"online rebuild with indexed virtual columns"
;
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS
)
;
}
else
{
}
else
{
ha_alter_info
->
unsupported_reason
=
my_get_err_msg
(
/* MDEV-14341 FIXME: Remove this limitation. */
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS
);
ha_alter_info
->
unsupported_reason
=
}
"online rebuild with indexed virtual columns"
;
}
}
online
=
false
;
}
}
if
(
ha_alter_info
->
handler_flags
if
(
ha_alter_info
->
handler_flags
...
...
storage/innobase/row/row0mysql.cc
View file @
0474be0a
/*****************************************************************************
/*****************************************************************************
Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 201
8
, MariaDB Corporation.
Copyright (c) 2015, 201
9
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
the terms of the GNU General Public License as published by the Free Software
...
@@ -3425,8 +3425,11 @@ row_drop_table_for_mysql(
...
@@ -3425,8 +3425,11 @@ row_drop_table_for_mysql(
calling btr_search_drop_page_hash_index() while we
calling btr_search_drop_page_hash_index() while we
hold the InnoDB dictionary lock, we will drop any
hold the InnoDB dictionary lock, we will drop any
adaptive hash index entries upfront. */
adaptive hash index entries upfront. */
bool
immune
=
is_temp_name
||
strstr
(
table
->
name
.
m_name
,
"/FTS"
);
while
(
buf_LRU_drop_page_hash_for_tablespace
(
table
))
{
while
(
buf_LRU_drop_page_hash_for_tablespace
(
table
))
{
if
((
!
i
s_temp_nam
e
&&
trx_is_interrupted
(
trx
))
if
((
!
i
mmun
e
&&
trx_is_interrupted
(
trx
))
||
srv_shutdown_state
||
srv_shutdown_state
!=
SRV_SHUTDOWN_NONE
)
{
!=
SRV_SHUTDOWN_NONE
)
{
err
=
DB_INTERRUPTED
;
err
=
DB_INTERRUPTED
;
...
...
storage/innobase/row/row0sel.cc
View file @
0474be0a
...
@@ -254,9 +254,9 @@ row_sel_sec_rec_is_for_clust_rec(
...
@@ -254,9 +254,9 @@ row_sel_sec_rec_is_for_clust_rec(
clust_field
=
static_cast
<
byte
*>
(
vfield
->
data
);
clust_field
=
static_cast
<
byte
*>
(
vfield
->
data
);
}
else
{
}
else
{
clust_pos
=
dict_col_get_clust_pos
(
col
,
clust_index
);
clust_pos
=
dict_col_get_clust_pos
(
col
,
clust_index
);
ut_ad
(
!
rec_offs_nth_default
(
clust_offs
,
clust_pos
));
clust_field
=
rec_get_nth_cfield
(
clust_field
=
rec_get_nth_field
(
clust_rec
,
clust_index
,
clust_offs
,
clust_
rec
,
clust_offs
,
clust_
pos
,
&
clust_len
);
clust_pos
,
&
clust_len
);
}
}
sec_field
=
rec_get_nth_field
(
sec_rec
,
sec_offs
,
i
,
&
sec_len
);
sec_field
=
rec_get_nth_field
(
sec_rec
,
sec_offs
,
i
,
&
sec_len
);
...
@@ -2972,17 +2972,7 @@ row_sel_store_mysql_field_func(
...
@@ -2972,17 +2972,7 @@ row_sel_store_mysql_field_func(
}
else
{
}
else
{
/* The field is stored in the index record, or
/* The field is stored in the index record, or
in the metadata for instant ADD COLUMN. */
in the metadata for instant ADD COLUMN. */
data
=
rec_get_nth_cfield
(
rec
,
index
,
offsets
,
field_no
,
&
len
);
if
(
rec_offs_nth_default
(
offsets
,
field_no
))
{
ut_ad
(
dict_index_is_clust
(
index
));
ut_ad
(
index
->
is_instant
());
const
dict_index_t
*
clust_index
=
dict_table_get_first_index
(
prebuilt
->
table
);
ut_ad
(
index
==
clust_index
);
data
=
clust_index
->
instant_field_value
(
field_no
,
&
len
);
}
else
{
data
=
rec_get_nth_field
(
rec
,
offsets
,
field_no
,
&
len
);
}
if
(
len
==
UNIV_SQL_NULL
)
{
if
(
len
==
UNIV_SQL_NULL
)
{
/* MySQL assumes that the field for an SQL
/* MySQL assumes that the field for an SQL
...
...
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