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
3663e2cf
Commit
3663e2cf
authored
Dec 21, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
parents
ce206d90
920ed11a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
sql/ha_innodb.cc
sql/ha_innodb.cc
+3
-3
No files found.
sql/ha_innodb.cc
View file @
3663e2cf
...
...
@@ -5357,7 +5357,7 @@ ha_innobase::transactional_table_lock(
"MySQL is trying to use a table handle but the .ibd file for
\n
"
"table %s does not exist.
\n
"
"Have you deleted the .ibd file from the database directory under
\n
"
"the MySQL datadir
, or have you used DISCARD TABLESPACE?
\n
"
"the MySQL datadir
?
"
"Look from section 15.1 of http://www.innodb.com/ibman.html
\n
"
"how you can resolve the problem.
\n
"
,
prebuilt
->
table
->
name
);
...
...
@@ -5376,8 +5376,8 @@ ha_innobase::transactional_table_lock(
prebuilt
->
select_lock_type
=
LOCK_X
;
prebuilt
->
stored_select_lock_type
=
LOCK_X
;
}
else
if
(
lock_type
==
F_RDLCK
)
{
prebuilt
->
select_lock_type
=
LOCK_
X
;
prebuilt
->
stored_select_lock_type
=
LOCK_
X
;
prebuilt
->
select_lock_type
=
LOCK_
S
;
prebuilt
->
stored_select_lock_type
=
LOCK_
S
;
}
else
{
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
" InnoDB error:
\n
"
...
...
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