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
7ed01976
Commit
7ed01976
authored
Sep 04, 2005
by
hf@deer.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Error message changed for buf #12694 as PeterG suggested
parent
aa991c6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
mysql-test/r/type_float.result
mysql-test/r/type_float.result
+4
-0
mysql-test/t/type_float.test
mysql-test/t/type_float.test
+2
-2
sql/share/errmsg.txt
sql/share/errmsg.txt
+2
-0
sql/sql_parse.cc
sql/sql_parse.cc
+2
-2
No files found.
mysql-test/r/type_float.result
View file @
7ed01976
...
@@ -225,3 +225,7 @@ select * from t1 where reckey=1.09E2;
...
@@ -225,3 +225,7 @@ select * from t1 where reckey=1.09E2;
reckey recdesc
reckey recdesc
109 Has 109 as key
109 Has 109 as key
drop table t1;
drop table t1;
create table t1 (s1 float(0,2));
ERROR 42000: For float(M,D) or double(M,D), M must be >= D (column 's1').
create table t1 (s1 float(1,2));
ERROR 42000: For float(M,D) or double(M,D), M must be >= D (column 's1').
mysql-test/t/type_float.test
View file @
7ed01976
...
@@ -152,7 +152,7 @@ drop table t1;
...
@@ -152,7 +152,7 @@ drop table t1;
# bug #12694 (float(m,d) specifications)
# bug #12694 (float(m,d) specifications)
#
#
--
error
14
27
--
error
14
43
create
table
t1
(
s1
float
(
0
,
2
));
create
table
t1
(
s1
float
(
0
,
2
));
--
error
14
27
--
error
14
43
create
table
t1
(
s1
float
(
1
,
2
));
create
table
t1
(
s1
float
(
1
,
2
));
sql/share/errmsg.txt
View file @
7ed01976
...
@@ -5399,3 +5399,5 @@ ER_DATETIME_FUNCTION_OVERFLOW 22008
...
@@ -5399,3 +5399,5 @@ ER_DATETIME_FUNCTION_OVERFLOW 22008
eng "Datetime function: %-.32s field overflow"
eng "Datetime function: %-.32s field overflow"
ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger."
eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger."
ER_M_BIGGER_THAN_D 42000 S1009
eng "For float(M,D) or double(M,D), M must be >= D (column '%-.64s')."
sql/sql_parse.cc
View file @
7ed01976
...
@@ -5760,7 +5760,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
...
@@ -5760,7 +5760,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
if
(
new_field
->
length
<
new_field
->
decimals
&&
if
(
new_field
->
length
<
new_field
->
decimals
&&
new_field
->
decimals
!=
NOT_FIXED_DEC
)
new_field
->
decimals
!=
NOT_FIXED_DEC
)
{
{
my_error
(
ER_
SCALE_BIGGER_THAN_PRECISION
,
MYF
(
0
),
field_name
);
my_error
(
ER_
M_BIGGER_THAN_D
,
MYF
(
0
),
field_name
);
DBUG_RETURN
(
NULL
);
DBUG_RETURN
(
NULL
);
}
}
break
;
break
;
...
@@ -5774,7 +5774,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
...
@@ -5774,7 +5774,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
if
(
new_field
->
length
<
new_field
->
decimals
&&
if
(
new_field
->
length
<
new_field
->
decimals
&&
new_field
->
decimals
!=
NOT_FIXED_DEC
)
new_field
->
decimals
!=
NOT_FIXED_DEC
)
{
{
my_error
(
ER_
SCALE_BIGGER_THAN_PRECISION
,
MYF
(
0
),
field_name
);
my_error
(
ER_
M_BIGGER_THAN_D
,
MYF
(
0
),
field_name
);
DBUG_RETURN
(
NULL
);
DBUG_RETURN
(
NULL
);
}
}
break
;
break
;
...
...
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