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
4cdca348
Commit
4cdca348
authored
Aug 08, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.0-6080
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
0a7b2963
268a68ad
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
5 deletions
+26
-5
mysql-test/r/errors.result
mysql-test/r/errors.result
+5
-0
mysql-test/r/type_bit.result
mysql-test/r/type_bit.result
+1
-1
mysql-test/r/type_bit_innodb.result
mysql-test/r/type_bit_innodb.result
+1
-1
mysql-test/t/errors.test
mysql-test/t/errors.test
+11
-0
mysql-test/t/type_bit_innodb.test
mysql-test/t/type_bit_innodb.test
+1
-1
sql/share/errmsg.txt
sql/share/errmsg.txt
+2
-0
sql/sql_parse.cc
sql/sql_parse.cc
+5
-2
No files found.
mysql-test/r/errors.result
View file @
4cdca348
...
...
@@ -23,3 +23,8 @@ ERROR 42S22: Unknown column 't1.b' in 'order clause'
select count(*),b from t1;
ERROR 42S22: Unknown column 'b' in 'field list'
drop table t1;
create table t1 (a int(256));
ERROR 42000: Display width out of range for column 'a' (max = 255)
set sql_mode='traditional';
create table t1 (a varchar(66000));
ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
mysql-test/r/type_bit.result
View file @
4cdca348
...
...
@@ -36,7 +36,7 @@ select 0 + b'1000000000000001';
32769
drop table if exists t1;
create table t1 (a bit(65));
ERROR 42000:
Column length too big for column 'a' (max = 64); use BLOB or TEXT instead
ERROR 42000:
Display width out of range for column 'a' (max = 64)
create table t1 (a bit(0));
show create table t1;
Table Create Table
...
...
mysql-test/r/type_bit_innodb.result
View file @
4cdca348
...
...
@@ -36,7 +36,7 @@ select 0 + b'1000000000000001';
32769
drop table if exists t1;
create table t1 (a bit(65)) engine=innodb;
ERROR 42000:
Column length too big for column 'a' (max = 64); use BLOB or TEXT instead
ERROR 42000:
Display width out of range for column 'a' (max = 64)
create table t1 (a bit(0)) engine=innodb;
show create table t1;
Table Create Table
...
...
mysql-test/t/errors.test
View file @
4cdca348
...
...
@@ -31,3 +31,14 @@ select count(*),b from t1;
drop
table
t1
;
# End of 4.1 tests
#
# Bug #6080: Error message for a field with a display width that is too long
#
--
error
1438
create
table
t1
(
a
int
(
256
));
set
sql_mode
=
'traditional'
;
--
error
1074
create
table
t1
(
a
varchar
(
66000
));
# End of 5.0 tests
mysql-test/t/type_bit_innodb.test
View file @
4cdca348
...
...
@@ -20,7 +20,7 @@ select 0 + b'1000000000000001';
drop
table
if
exists
t1
;
--
enable_warnings
--
error
1
074
--
error
1
438
create
table
t1
(
a
bit
(
65
))
engine
=
innodb
;
create
table
t1
(
a
bit
(
0
))
engine
=
innodb
;
...
...
sql/share/errmsg.txt
View file @
4cdca348
...
...
@@ -5391,3 +5391,5 @@ ER_TOO_LONG_BODY 42000 S1009
ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
eng "Cannot drop default keycache"
ger "Der Default-Keycache kann nicht gelscht werden"
ER_TOO_BIG_DISPLAYWIDTH 42000 S1009
eng "Display width out of range for column '%-.64s' (max = %d)"
sql/sql_parse.cc
View file @
4cdca348
...
...
@@ -5819,7 +5819,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
new_field
->
length
=
1
;
if
(
new_field
->
length
>
MAX_BIT_FIELD_LENGTH
)
{
my_error
(
ER_TOO_BIG_
FIELDLENG
TH
,
MYF
(
0
),
field_name
,
my_error
(
ER_TOO_BIG_
DISPLAYWID
TH
,
MYF
(
0
),
field_name
,
MAX_BIT_FIELD_LENGTH
);
DBUG_RETURN
(
NULL
);
}
...
...
@@ -5838,7 +5838,10 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
type
!=
MYSQL_TYPE_STRING
&&
type
!=
MYSQL_TYPE_VARCHAR
&&
type
!=
FIELD_TYPE_GEOMETRY
)))
{
my_error
(
ER_TOO_BIG_FIELDLENGTH
,
MYF
(
0
),
my_error
((
type
==
MYSQL_TYPE_VAR_STRING
||
type
==
MYSQL_TYPE_VARCHAR
||
type
==
MYSQL_TYPE_STRING
)
?
ER_TOO_BIG_FIELDLENGTH
:
ER_TOO_BIG_DISPLAYWIDTH
,
MYF
(
0
),
field_name
,
max_field_charlength
);
/* purecov: inspected */
DBUG_RETURN
(
NULL
);
}
...
...
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