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
96806025
Commit
96806025
authored
Jun 16, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failure on main.partition_innodb.
parent
ababe047
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
13 deletions
+15
-13
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+15
-13
No files found.
storage/xtradb/handler/ha_innodb.cc
View file @
96806025
...
...
@@ -10550,7 +10550,7 @@ ha_innobase::create(
DBUG_ASSERT
(
thd
!=
NULL
);
DBUG_ASSERT
(
create_info
!=
NULL
);
if
(
form
->
s
->
fields
>
REC_MAX_N_USER_FIELDS
)
{
if
(
form
->
s
->
stored_
fields
>
REC_MAX_N_USER_FIELDS
)
{
DBUG_RETURN
(
HA_ERR_TOO_MANY_FIELDS
);
}
else
if
(
srv_read_only_mode
)
{
DBUG_RETURN
(
HA_ERR_TABLE_READONLY
);
...
...
@@ -11931,18 +11931,6 @@ ha_innobase::info_low(
prebuilt
->
trx
->
op_info
=
"returning various info to MySQL"
;
}
my_snprintf
(
path
,
sizeof
(
path
),
"%s/%s%s"
,
mysql_data_home
,
ib_table
->
name
,
reg_ext
);
unpack_filename
(
path
,
path
);
/* Note that we do not know the access time of the table,
nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
if
(
os_file_get_status
(
path
,
&
stat_info
,
false
)
==
DB_SUCCESS
)
{
stats
.
create_time
=
(
ulong
)
stat_info
.
ctime
;
}
}
if
(
flag
&
HA_STATUS_VARIABLE
)
{
...
...
@@ -12228,6 +12216,20 @@ ha_innobase::info_low(
if
(
!
(
flag
&
HA_STATUS_NO_LOCK
))
{
dict_table_stats_unlock
(
ib_table
,
RW_S_LATCH
);
}
my_snprintf
(
path
,
sizeof
(
path
),
"%s/%s%s"
,
mysql_data_home
,
table
->
s
->
normalized_path
.
str
,
reg_ext
);
unpack_filename
(
path
,
path
);
/* Note that we do not know the access time of the table,
nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
if
(
os_file_get_status
(
path
,
&
stat_info
,
false
)
==
DB_SUCCESS
)
{
stats
.
create_time
=
(
ulong
)
stat_info
.
ctime
;
}
}
if
(
srv_force_recovery
>=
SRV_FORCE_NO_IBUF_MERGE
)
{
...
...
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