Commit 20c2ddaf authored by unknown's avatar unknown
Browse files

Bug #19498: Inconsistent support for DEFAULT in TEXT columns 

  When a default of '' was specified for TEXT/BLOB columns, the specification
  was silently ignored. This is presumably to be nice to applications (or
  people) who generate their column definitions in a not-very-clever fashion.

  For clarity, doing this now results in a warning, or an error in strict
  mode.


mysql-test/r/federated.result:
  Update results
mysql-test/r/fulltext_distinct.result:
  Update results
mysql-test/r/fulltext_update.result:
  Update results
mysql-test/r/gis-rtree.result:
  Update results
mysql-test/r/gis.result:
  Update results
mysql-test/r/join_outer.result:
  Update results
mysql-test/r/order_by.result:
  Update results
mysql-test/r/type_blob.result:
  Add new results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/type_blob.test:
  Add new test
sql/field.cc:
  Issue a warning when setting '' as the default on a BLOB/TEXT column,
  and make it an error in strict mode. Also, clarify comments about when
  NO_DEFAULT_VALUE_FLAG is set.
parent a7dddd3b

mysql-test/r/federated.result

+4 −0
Original line number Diff line number Diff line
@@ -967,6 +967,8 @@ CREATE TABLE federated.t1 ( 
`blurb` text default '',

PRIMARY KEY (blurb_id))

DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'blurb' can't have a default value

DROP TABLE IF EXISTS federated.t1;

CREATE TABLE federated.t1 (

`blurb_id` int NOT NULL DEFAULT 0,
@@ -975,6 +977,8 @@ PRIMARY KEY (blurb_id)) 
ENGINE="FEDERATED"

  DEFAULT CHARSET=latin1

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';

Warnings:

Warning	1101	BLOB/TEXT column 'blurb' can't have a default value

INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types.  This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements.  The overview is intentionally brief.  The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");

INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");

INSERT INTO federated.t1 VALUES (3, " A floating-point number.  p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following.  FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined.  ");

mysql-test/r/fulltext_distinct.result

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ KEY kt(tag), 
KEY kv(value(15)),

FULLTEXT KEY kvf(value)

) ENGINE=MyISAM;

Warnings:

Warning	1101	BLOB/TEXT column 'value' can't have a default value

CREATE TABLE t2 (

id_t2 mediumint unsigned NOT NULL default '0',

id_t1 mediumint unsigned NOT NULL default '0',

mysql-test/r/fulltext_update.result

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ name VARCHAR(80) DEFAULT '' NOT NULL, 
FULLTEXT(url,description,shortdesc,longdesc),

PRIMARY KEY(gnr)

);

Warnings:

Warning	1101	BLOB/TEXT column 'longdesc' can't have a default value

insert into test (url,shortdesc,longdesc,description,name) VALUES 

("http:/test.at", "kurz", "lang","desc", "name");

insert into test (url,shortdesc,longdesc,description,name) VALUES

mysql-test/r/gis-rtree.result

+6 −0
Original line number Diff line number Diff line
@@ -804,6 +804,8 @@ INSERT INTO t2 SELECT GeomFromText(st) FROM t1; 
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field

drop table t1, t2;

CREATE TABLE t1 (`geometry` geometry NOT NULL default '',SPATIAL KEY `gndx` (`geometry`(32))) ENGINE=MyISAM DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'geometry' can't have a default value

INSERT INTO t1 (geometry) VALUES

(PolygonFromText('POLYGON((-18.6086111000 -66.9327777000, -18.6055555000

-66.8158332999, -18.7186111000 -66.8102777000, -18.7211111000 -66.9269443999,
@@ -820,6 +822,8 @@ CREATE TABLE t1 ( 
c1 geometry NOT NULL default '',

SPATIAL KEY i1 (c1(32))

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'c1' can't have a default value

INSERT INTO t1 (c1) VALUES (

PolygonFromText('POLYGON((-18.6086111000 -66.9327777000,

                            -18.6055555000 -66.8158332999,
@@ -834,6 +838,8 @@ CREATE TABLE t1 ( 
c1 geometry NOT NULL default '',

SPATIAL KEY i1 (c1(32))

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

Warnings:

Warning	1101	BLOB/TEXT column 'c1' can't have a default value

INSERT INTO t1 (c1) VALUES (

PolygonFromText('POLYGON((-18.6086111000 -66.9327777000,

                            -18.6055555000 -66.8158332999,

mysql-test/r/gis.result

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ t1 CREATE TABLE `t1` ( 
drop table t1;

CREATE TABLE `t1` (`object_id` bigint(20) unsigned NOT NULL default '0', `geo`

geometry NOT NULL default '') ENGINE=MyISAM ;

Warnings:

Warning	1101	BLOB/TEXT column 'geo' can't have a default value

insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363

36.305435,-114.992394 36.305202,-114.991219 36.305975,-114.991163

36.306845,-114.989432 36.309452,-114.978275 36.312642,-114.977363