summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-03-29 18:48:31 +0200
committerunknown <kent@mysql.com>2005-03-29 18:48:31 +0200
commit01ba6b1d094dd912ab58b76c73330dd8bdb2eea8 (patch)
tree19d4f84cf64daa4d59dfe118a9e6313f66700a2d /mysql-test
parent2c546db39075e0478007c1a7451299d2015cc0e5 (diff)
parent0b45706c3bb5d855d1cc71cd8610a2d9c96e9547 (diff)
downloadmariadb-git-01ba6b1d094dd912ab58b76c73330dd8bdb2eea8.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_blob.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index b1dc895ecc5..7481dc18641 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -27,7 +27,7 @@ t3 CREATE TABLE `t3` (
drop table t1,t2,t3
#;
CREATE TABLE t1 (a char(257) default "hello");
-ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB instead
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
CREATE TABLE t2 (a blob default "hello");
ERROR 42000: BLOB/TEXT column 'a' can't have a default value
drop table if exists t1,t2;