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
51d457f3
Commit
51d457f3
authored
7 years ago
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compilation failures
with -DPLUGIN_PARTITION=NO and -DPLUGIN_PERFSCHEMA=NO
parent
291411c9
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
sql/mysqld.cc
sql/mysqld.cc
+4
-4
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+2
-2
No files found.
sql/mysqld.cc
View file @
51d457f3
...
@@ -79,6 +79,10 @@
...
@@ -79,6 +79,10 @@
#include "sql_callback.h"
#include "sql_callback.h"
#include "threadpool.h"
#include "threadpool.h"
#ifdef HAVE_OPENSSL
#include <ssl_compat.h>
#endif
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
#include "../storage/perfschema/pfs_server.h"
#include "../storage/perfschema/pfs_server.h"
#endif
/* WITH_PERFSCHEMA_STORAGE_ENGINE */
#endif
/* WITH_PERFSCHEMA_STORAGE_ENGINE */
...
@@ -338,13 +342,9 @@ static PSI_thread_key key_thread_handle_con_sockets;
...
@@ -338,13 +342,9 @@ static PSI_thread_key key_thread_handle_con_sockets;
static
PSI_thread_key
key_thread_handle_shutdown
;
static
PSI_thread_key
key_thread_handle_shutdown
;
#endif
/* __WIN__ */
#endif
/* __WIN__ */
#ifdef HAVE_OPENSSL
#include <ssl_compat.h>
#ifdef HAVE_OPENSSL10
#ifdef HAVE_OPENSSL10
static
PSI_rwlock_key
key_rwlock_openssl
;
static
PSI_rwlock_key
key_rwlock_openssl
;
#endif
#endif
#endif
#endif
/* HAVE_PSI_INTERFACE */
#endif
/* HAVE_PSI_INTERFACE */
#ifdef HAVE_NPTL
#ifdef HAVE_NPTL
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/handler/handler0alter.cc
View file @
51d457f3
...
@@ -764,8 +764,8 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -764,8 +764,8 @@ ha_innobase::check_if_supported_inplace_alter(
|
Alter_inplace_info
::
DROP_INDEX
);
|
Alter_inplace_info
::
DROP_INDEX
);
if
(
flags
!=
0
if
(
flags
!=
0
||
(
altered_table
->
s
->
partition_info_str
||
IF_PARTITIONING
(
(
altered_table
->
s
->
partition_info_str
&&
altered_table
->
s
->
partition_info_str_len
)
&&
altered_table
->
s
->
partition_info_str_len
)
,
0
)
||
(
!
check_v_col_in_order
(
||
(
!
check_v_col_in_order
(
this
->
table
,
altered_table
,
ha_alter_info
)))
{
this
->
table
,
altered_table
,
ha_alter_info
)))
{
ha_alter_info
->
unsupported_reason
=
ha_alter_info
->
unsupported_reason
=
...
...
This diff is collapsed.
Click to expand it.
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