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
ac29d095
Commit
ac29d095
authored
Apr 13, 2010
by
Vasil Dimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replay c2996 on top of the new storage/innobase
parent
c877ff39
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
7 deletions
+11
-7
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+4
-3
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+3
-1
storage/innobase/handler/i_s.cc
storage/innobase/handler/i_s.cc
+3
-2
storage/innobase/handler/mysql_addons.cc
storage/innobase/handler/mysql_addons.cc
+1
-1
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
ac29d095
...
...
@@ -43,11 +43,14 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#pragma implementation // gcc: Class implementation
#endif
#include <mysql_priv.h>
#include <sql_table.h> // explain_filename, nz2, EXPLAIN_PARTITIONS_AS_COMMENT,
// EXPLAIN_FILENAME_MAX_EXTRA_LENGTH
#include <sql_acl.h> // PROCESS_ACL
#include <m_ctype.h>
#include <mysys_err.h>
#include <mysql/plugin.h>
#include <mysql/innodb_priv.h>
#include <mysql/psi/psi.h>
/** @file ha_innodb.cc */
...
...
@@ -89,7 +92,6 @@ extern "C" {
#include "ha_innodb.h"
#include "i_s.h"
#ifndef MYSQL_SERVER
# ifndef MYSQL_PLUGIN_IMPORT
# define MYSQL_PLUGIN_IMPORT
/* nothing */
# endif
/* MYSQL_PLUGIN_IMPORT */
...
...
@@ -99,7 +101,6 @@ extern "C" {
but we need it here */
bool
check_global_access
(
THD
*
thd
,
ulong
want_access
);
#endif
/* MYSQL_VERSION_ID < 50124 */
#endif
/* MYSQL_SERVER */
/** to protect innobase_open_files */
static
mysql_mutex_t
innobase_share_mutex
;
...
...
storage/innobase/handler/handler0alter.cc
View file @
ac29d095
...
...
@@ -21,8 +21,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA
Smart ALTER TABLE
*******************************************************/
#include <
mysql_priv
.h>
#include <
unireg
.h>
#include <mysqld_error.h>
#include <sql_lex.h> // SQLCOM_CREATE_INDEX
#include <mysql/innodb_priv.h>
extern
"C"
{
#include "log0log.h"
...
...
storage/innobase/handler/i_s.cc
View file @
ac29d095
...
...
@@ -23,8 +23,8 @@ InnoDB INFORMATION SCHEMA tables interface to MySQL.
Created July 18, 2007 Vasil Dimov
*******************************************************/
#include <mysql_priv.h>
#include <mysqld_error.h>
#include <sql_acl.h> // PROCESS_ACL
#include <m_ctype.h>
#include <hash.h>
...
...
@@ -32,7 +32,8 @@ Created July 18, 2007 Vasil Dimov
#include <mysys_err.h>
#include <my_sys.h>
#include "i_s.h"
#include <mysql/plugin.h>
#include <sql_plugin.h>
#include <mysql/innodb_priv.h>
extern
"C"
{
#include "trx0i_s.h"
...
...
storage/innobase/handler/mysql_addons.cc
View file @
ac29d095
...
...
@@ -36,7 +36,7 @@ Created November 07, 2007 Vasil Dimov
#define MYSQL_SERVER
#endif
/* MYSQL_SERVER */
#include <
my
sql_priv.h>
#include <sql_priv.h>
#include "mysql_addons.h"
#include "univ.i"
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