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
49ad134e
Commit
49ad134e
authored
Feb 24, 2006
by
konstantin@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After-merge fixes (Bug#13134)
parent
90edf372
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
sql/field.cc
sql/field.cc
+3
-1
sql/sql_parse.cc
sql/sql_parse.cc
+0
-1
No files found.
sql/field.cc
View file @
49ad134e
...
...
@@ -8269,7 +8269,7 @@ void create_field::init_for_tmp_table(enum_field_types sql_type_arg,
{
field_name
=
""
;
sql_type
=
sql_type_arg
;
length
=
length_arg
;;
char_length
=
length
=
length_arg
;;
unireg_check
=
Field
::
NONE
;
interval
=
0
;
charset
=
&
my_charset_bin
;
...
...
@@ -8597,6 +8597,8 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
case
FIELD_TYPE_DECIMAL
:
DBUG_ASSERT
(
0
);
/* Was obsolete */
}
/* Remember the value of length */
char_length
=
length
;
if
(
!
(
flags
&
BLOB_FLAG
)
&&
((
length
>
max_field_charlength
&&
fld_type
!=
FIELD_TYPE_SET
&&
...
...
sql/sql_parse.cc
View file @
49ad134e
...
...
@@ -5791,7 +5791,6 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
interval_list
,
cs
,
uint_geom_type
))
DBUG_RETURN
(
1
);
new_field
->
char_length
=
new_field
->
length
;
lex
->
create_list
.
push_back
(
new_field
);
lex
->
last_field
=
new_field
;
DBUG_RETURN
(
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