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
c7635dcb
Commit
c7635dcb
authored
Feb 11, 2008
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge stella.local:/home2/mydev/mysql-5.1-bug31331
into stella.local:/home2/mydev/mysql-5.1-axmrg
parents
6e7bae17
e1d6b4e9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.cc
+20
-1
No files found.
storage/myisam/ha_myisam.cc
View file @
c7635dcb
...
...
@@ -397,7 +397,26 @@ int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo,
}
for
(
j
=
t1_keyinfo
[
i
].
keysegs
;
j
--
;)
{
if
(
t1_keysegs
[
j
].
type
!=
t2_keysegs
[
j
].
type
||
uint8
t1_keysegs_j__type
=
t1_keysegs
[
j
].
type
;
/*
Table migration from 4.1 to 5.1. In 5.1 a *TEXT key part is
always HA_KEYTYPE_VARTEXT2. In 4.1 we had only the equivalent of
HA_KEYTYPE_VARTEXT1. Since we treat both the same on MyISAM
level, we can ignore a mismatch between these types.
*/
if
((
t1_keysegs
[
j
].
flag
&
HA_BLOB_PART
)
&&
(
t2_keysegs
[
j
].
flag
&
HA_BLOB_PART
))
{
if
((
t1_keysegs_j__type
==
HA_KEYTYPE_VARTEXT2
)
&&
(
t2_keysegs
[
j
].
type
==
HA_KEYTYPE_VARTEXT1
))
t1_keysegs_j__type
=
HA_KEYTYPE_VARTEXT1
;
else
if
((
t1_keysegs_j__type
==
HA_KEYTYPE_VARBINARY2
)
&&
(
t2_keysegs
[
j
].
type
==
HA_KEYTYPE_VARBINARY1
))
t1_keysegs_j__type
=
HA_KEYTYPE_VARBINARY1
;
}
if
(
t1_keysegs_j__type
!=
t2_keysegs
[
j
].
type
||
t1_keysegs
[
j
].
language
!=
t2_keysegs
[
j
].
language
||
t1_keysegs
[
j
].
null_bit
!=
t2_keysegs
[
j
].
null_bit
||
t1_keysegs
[
j
].
length
!=
t2_keysegs
[
j
].
length
)
...
...
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