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
70356012
Commit
70356012
authored
Jan 14, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
parents
4db9aaee
8c3a1fde
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
sql/field.h
sql/field.h
+2
-0
sql/ha_myisam.cc
sql/ha_myisam.cc
+1
-1
No files found.
sql/field.h
View file @
70356012
...
@@ -123,6 +123,7 @@ class Field
...
@@ -123,6 +123,7 @@ class Field
}
}
virtual
bool
eq_def
(
Field
*
field
);
virtual
bool
eq_def
(
Field
*
field
);
virtual
uint32
pack_length
()
const
{
return
(
uint32
)
field_length
;
}
virtual
uint32
pack_length
()
const
{
return
(
uint32
)
field_length
;
}
virtual
uint32
pack_length_in_rec
()
const
{
return
pack_length
();
}
virtual
void
reset
(
void
)
{
bzero
(
ptr
,
pack_length
());
}
virtual
void
reset
(
void
)
{
bzero
(
ptr
,
pack_length
());
}
virtual
void
reset_fields
()
{}
virtual
void
reset_fields
()
{}
virtual
void
set_default
()
virtual
void
set_default
()
...
@@ -1237,6 +1238,7 @@ class Field_bit :public Field {
...
@@ -1237,6 +1238,7 @@ class Field_bit :public Field {
{
get_key_image
(
buff
,
length
,
itRAW
);
}
{
get_key_image
(
buff
,
length
,
itRAW
);
}
uint32
pack_length
()
const
uint32
pack_length
()
const
{
return
(
uint32
)
field_length
+
(
bit_len
>
0
);
}
{
return
(
uint32
)
field_length
+
(
bit_len
>
0
);
}
uint32
pack_length_in_rec
()
const
{
return
field_length
;
}
void
sql_type
(
String
&
str
)
const
;
void
sql_type
(
String
&
str
)
const
;
field_cast_enum
field_cast_type
()
{
return
FIELD_CAST_BIT
;
}
field_cast_enum
field_cast_type
()
{
return
FIELD_CAST_BIT
;
}
char
*
pack
(
char
*
to
,
const
char
*
from
,
uint
max_length
=~
(
uint
)
0
);
char
*
pack
(
char
*
to
,
const
char
*
from
,
uint
max_length
=~
(
uint
)
0
);
...
...
sql/ha_myisam.cc
View file @
70356012
...
@@ -1467,7 +1467,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
...
@@ -1467,7 +1467,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
fieldpos
<=
minpos
)
fieldpos
<=
minpos
)
{
{
/* skip null fields */
/* skip null fields */
if
(
!
(
temp_length
=
(
*
field
)
->
pack_length
()))
if
(
!
(
temp_length
=
(
*
field
)
->
pack_length
_in_rec
()))
continue
;
/* Skip null-fields */
continue
;
/* Skip null-fields */
if
(
!
found
||
fieldpos
<
minpos
||
if
(
!
found
||
fieldpos
<
minpos
||
(
fieldpos
==
minpos
&&
temp_length
<
length
))
(
fieldpos
==
minpos
&&
temp_length
<
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