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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
94cdd5c0
Commit
94cdd5c0
authored
Nov 30, 2005
by
osku
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
From MySQL:
We new use TABLE_SHARE instead of TABLE when creating engine handlers.
parent
1ed017dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
handler/ha_innodb.cc
handler/ha_innodb.cc
+5
-5
handler/ha_innodb.h
handler/ha_innodb.h
+1
-1
No files found.
handler/ha_innodb.cc
View file @
94cdd5c0
...
@@ -205,7 +205,7 @@ static int innobase_rollback(THD* thd, bool all);
...
@@ -205,7 +205,7 @@ static int innobase_rollback(THD* thd, bool all);
static
int
innobase_rollback_to_savepoint
(
THD
*
thd
,
void
*
savepoint
);
static
int
innobase_rollback_to_savepoint
(
THD
*
thd
,
void
*
savepoint
);
static
int
innobase_savepoint
(
THD
*
thd
,
void
*
savepoint
);
static
int
innobase_savepoint
(
THD
*
thd
,
void
*
savepoint
);
static
int
innobase_release_savepoint
(
THD
*
thd
,
void
*
savepoint
);
static
int
innobase_release_savepoint
(
THD
*
thd
,
void
*
savepoint
);
static
handler
*
innobase_create_handler
(
TABLE
*
table
);
static
handler
*
innobase_create_handler
(
TABLE
_SHARE
*
table
);
handlerton
innobase_hton
=
{
handlerton
innobase_hton
=
{
"InnoDB"
,
"InnoDB"
,
...
@@ -245,7 +245,7 @@ handlerton innobase_hton = {
...
@@ -245,7 +245,7 @@ handlerton innobase_hton = {
};
};
static
handler
*
innobase_create_handler
(
TABLE
*
table
)
static
handler
*
innobase_create_handler
(
TABLE
_SHARE
*
table
)
{
{
return
new
ha_innobase
(
table
);
return
new
ha_innobase
(
table
);
}
}
...
@@ -826,7 +826,7 @@ check_trx_exists(
...
@@ -826,7 +826,7 @@ check_trx_exists(
/*************************************************************************
/*************************************************************************
Construct ha_innobase handler. */
Construct ha_innobase handler. */
ha_innobase
::
ha_innobase
(
TABLE
*
table_arg
)
ha_innobase
::
ha_innobase
(
TABLE
_SHARE
*
table_arg
)
:
handler
(
&
innobase_hton
,
table_arg
),
:
handler
(
&
innobase_hton
,
table_arg
),
int_table_flags
(
HA_REC_NOT_IN_SEQ
|
int_table_flags
(
HA_REC_NOT_IN_SEQ
|
HA_NULL_IN_KEY
|
HA_NULL_IN_KEY
|
...
@@ -4827,8 +4827,8 @@ ha_innobase::create(
...
@@ -4827,8 +4827,8 @@ ha_innobase::create(
/* Look for a primary key */
/* Look for a primary key */
primary_key_no
=
(
table
->
s
->
primary_key
!=
MAX_KEY
?
primary_key_no
=
(
form
->
s
->
primary_key
!=
MAX_KEY
?
(
int
)
table
->
s
->
primary_key
:
(
int
)
form
->
s
->
primary_key
:
-
1
);
-
1
);
/* Our function row_get_mysql_key_number_for_index assumes
/* Our function row_get_mysql_key_number_for_index assumes
...
...
handler/ha_innodb.h
View file @
94cdd5c0
...
@@ -81,7 +81,7 @@ class ha_innobase: public handler
...
@@ -81,7 +81,7 @@ class ha_innobase: public handler
/* Init values for the class: */
/* Init values for the class: */
public:
public:
ha_innobase
(
TABLE
*
table_arg
);
ha_innobase
(
TABLE
_SHARE
*
table_arg
);
~
ha_innobase
()
{}
~
ha_innobase
()
{}
/*
/*
Get the row type from the storage engine. If this method returns
Get the row type from the storage engine. If this method returns
...
...
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