summaryrefslogtreecommitdiff
path: root/mysql-test/r/errors.result
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-05 17:22:53 -0700
committerunknown <jimw@mysql.com>2005-08-05 17:22:53 -0700
commitc62a594200b934b546f4f2200345165d109bf189 (patch)
tree5d14f8a9c4945dd61759c95d59bbdd4d5df96fb4 /mysql-test/r/errors.result
parentd17c9b06926aaba7af4d4cae2e7914fd9db5ee9d (diff)
downloadmariadb-git-c62a594200b934b546f4f2200345165d109bf189.tar.gz
Fix error message when creating a non-string field with a display
width beyond the maximum. (Bug #6080) mysql-test/r/errors.result: Update results mysql-test/r/type_bit.result: Update results mysql-test/r/type_bit_innodb.result: Update results mysql-test/t/errors.test: Add new regression test mysql-test/t/type_bit_innodb.test: Update error code in test sql/share/errmsg.txt: Add new error message sql/sql_parse.cc: Display more appropriate error message for column creation that fails due to a non-string field with a display width that is too big.
Diffstat (limited to 'mysql-test/r/errors.result')
-rw-r--r--mysql-test/r/errors.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result
index d0011c8deb6..9a91c088aca 100644
--- a/mysql-test/r/errors.result
+++ b/mysql-test/r/errors.result
@@ -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