Commit e633aebd authored by unknown's avatar unknown
Browse files

after merge fix

parent 26ff24f0

mysql-test/r/type_blob.result

+3 −3
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ t4 CREATE TABLE `t4` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1,t2,t3,t4;

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 char(256));

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 t1 (a varchar(70000) default "hello");

ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB instead

ERROR 42000: Column length too big for column 'a' (max = 65535); 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;

sql/share/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -1774,7 +1774,7 @@ ER_TOO_BIG_FIELDLENGTH 42000 S1009 
	cze "P-Bli velk dlka sloupce '%-.64s' (nejvce %d). Pouijte BLOB"

	dan "For stor feltlngde for kolonne '%-.64s' (maks = %d). Brug BLOB i stedet"

	nla "Te grote kolomlengte voor '%-.64s' (max = %d). Maak hiervoor gebruik van het type BLOB"

	eng "Column length too big for column '%-.64s' (max = %d); use BLOB instead"

	eng "Column length too big for column '%-.64s' (max = %d); use BLOB or TEXT instead"

	jps "column '%-.64s' ,mۂ column ̑傫܂. (ő %d ܂). BLOB ɎgpĂ.",

	est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %d). Kasuta BLOB vljatpi"

	fre "Champ '%-.64s' trop long (max = %d). Utilisez un BLOB"
@@ -1789,7 +1789,7 @@ ER_TOO_BIG_FIELDLENGTH 42000 S1009 
	pol "Zbyt dua dugo? kolumny '%-.64s' (maks. = %d). W zamian uyj typu BLOB"

	por "Comprimento da coluna '%-.64s' grande demais (max = %d); use BLOB em seu lugar"

	rum "Lungimea coloanei '%-.64s' este prea lunga (maximum = %d). Foloseste BLOB mai bine"

	rus "    '%-.64s' ( = %d).   BLOB  "

	rus "    '%-.64s' ( = %d).   BLOB  TEXT  "

	serbian "Previe podataka za kolonu '%-.64s' (maksimum je %d). Upotrebite BLOB polje"

	slo "Prli vek dka pre pole '%-.64s' (maximum = %d). Pouite BLOB"

	spa "Longitud de columna demasiado grande para la columna '%-.64s' (maximo = %d).Usar BLOB en su lugar"