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
368b9239
Commit
368b9239
authored
Apr 05, 2006
by
evgen@sunlight.local
Browse files
Options
Browse Files
Download
Plain Diff
Manually merged
parents
139808f0
d0724059
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
sql/field.h
sql/field.h
+6
-3
sql/sql_update.cc
sql/sql_update.cc
+5
-0
No files found.
sql/field.h
View file @
368b9239
...
...
@@ -1000,20 +1000,23 @@ public:
class
Field_string
:
public
Field_longstr
{
public:
bool
can_alter_field_type
;
Field_string
(
char
*
ptr_arg
,
uint32
len_arg
,
uchar
*
null_ptr_arg
,
uchar
null_bit_arg
,
enum
utype
unireg_check_arg
,
const
char
*
field_name_arg
,
CHARSET_INFO
*
cs
)
:
Field_longstr
(
ptr_arg
,
len_arg
,
null_ptr_arg
,
null_bit_arg
,
unireg_check_arg
,
field_name_arg
,
cs
)
{};
unireg_check_arg
,
field_name_arg
,
cs
),
can_alter_field_type
(
1
)
{};
Field_string
(
uint32
len_arg
,
bool
maybe_null_arg
,
const
char
*
field_name_arg
,
CHARSET_INFO
*
cs
)
:
Field_longstr
((
char
*
)
0
,
len_arg
,
maybe_null_arg
?
(
uchar
*
)
""
:
0
,
0
,
NONE
,
field_name_arg
,
cs
)
{};
NONE
,
field_name_arg
,
cs
),
can_alter_field_type
(
1
)
{};
enum_field_types
type
()
const
{
return
((
orig_table
&&
return
((
can_alter_field_type
&&
orig_table
&&
orig_table
->
s
->
db_create_options
&
HA_OPTION_PACK_RECORD
&&
field_length
>=
4
)
&&
orig_table
->
s
->
frm_version
<
FRM_VER_TRUE_VARCHAR
?
...
...
sql/sql_update.cc
View file @
368b9239
...
...
@@ -1229,6 +1229,11 @@ multi_update::initialize_tables(JOIN *join)
Field_string
offset
(
table
->
file
->
ref_length
,
0
,
"offset"
,
&
my_charset_bin
);
offset
.
init
(
table
);
/*
The field will be converted to varstring when creating tmp table if
table to be updated was created by mysql 4.1. Deny this.
*/
offset
.
can_alter_field_type
=
0
;
if
(
!
(
ifield
=
new
Item_field
(((
Field
*
)
&
offset
))))
DBUG_RETURN
(
1
);
ifield
->
maybe_null
=
0
;
...
...
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