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
13b5f718
Commit
13b5f718
authored
21 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post-merge fixes
parent
b1f5a036
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
15 deletions
+16
-15
myisam/ft_update.c
myisam/ft_update.c
+2
-2
sql/ha_myisam.cc
sql/ha_myisam.cc
+14
-13
No files found.
myisam/ft_update.c
View file @
13b5f718
...
...
@@ -324,8 +324,8 @@ uint _mi_ft_convert_to_ft2(MI_INFO *info, uint keynr, uchar *key)
mi_putint
(
info
->
buff
,
length
+
2
,
0
);
memcpy
(
info
->
buff
+
2
,
key_ptr
,
length
);
info
->
buff_used
=
info
->
page_changed
=
1
;
/* info->buff is used */
if
((
root
=
_mi_new
(
info
,
keyinfo
))
==
HA_OFFSET_ERROR
||
_mi_write_keypage
(
info
,
keyinfo
,
root
,
info
->
buff
))
if
((
root
=
_mi_new
(
info
,
keyinfo
,
DFLT_INIT_HITS
))
==
HA_OFFSET_ERROR
||
_mi_write_keypage
(
info
,
keyinfo
,
root
,
DFLT_INIT_HITS
,
info
->
buff
))
DBUG_RETURN
(
-
1
);
/* inserting the rest of key values */
...
...
This diff is collapsed.
Click to expand it.
sql/ha_myisam.cc
View file @
13b5f718
...
...
@@ -725,15 +725,16 @@ int ha_myisam::assign_to_keycache(THD* thd, HA_CHECK_OPT *check_opt)
/* Check validity of the index references */
if
(
!
triggered
&&
table_list
->
use_index
)
{
key_map
kmap
=
get_key_map_from_key_list
(
table
,
table_list
->
use_index
);
if
(
kmap
==
~
(
key_map
)
0
)
key_map
kmap
;
get_key_map_from_key_list
(
&
kmap
,
table
,
table_list
->
use_index
);
if
(
kmap
.
is_set_all
())
{
errmsg
=
thd
->
net
.
last_error
;
error
=
HA_ADMIN_FAILED
;
goto
err
;
}
if
(
kmap
)
map
=
kmap
;
if
(
!
kmap
.
is_clear_all
()
)
map
=
kmap
.
to_ulonglong
()
;
}
len
=
strlen
(
new_key_cache_name
);
...
...
This diff is collapsed.
Click to expand it.
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