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
63eaf44c
Commit
63eaf44c
authored
May 13, 2005
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
1436dd8f
c4c76c5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
sql/ha_blackhole.cc
sql/ha_blackhole.cc
+2
-1
sql/sql_base.cc
sql/sql_base.cc
+1
-1
No files found.
sql/ha_blackhole.cc
View file @
63eaf44c
...
...
@@ -129,8 +129,9 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
THR_LOCK_DATA
**
to
,
enum
thr_lock_type
lock_type
)
{
if
(
lock_type
!=
TL_IGNORE
&&
lock
.
type
==
TL_UNLOCK
)
lock
.
type
=
lock_type
;
*
to
++=
&
lock
;
return
to
;
}
...
...
sql/sql_base.cc
View file @
63eaf44c
...
...
@@ -2522,7 +2522,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
if
((
pos
=
find_type
(
&
table
->
keynames
,
name
->
ptr
(),
name
->
length
(),
1
))
<=
0
)
{
my_error
(
ER_KEY_COLUMN_DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
(),
my_error
(
ER_KEY_COLUMN_DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
_safe
(),
table
->
real_name
);
map
->
set_all
();
return
1
;
...
...
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