diff options
| author | unknown <ramil@ram-book.(none)> | 2005-05-13 16:44:14 +0500 |
|---|---|---|
| committer | unknown <ramil@ram-book.(none)> | 2005-05-13 16:44:14 +0500 |
| commit | c07f07c3e678f5f99bfd8ccf5c77cd4117758118 (patch) | |
| tree | 0be80257f620a71ccca5b2083ac05c487bbc1bb6 /mysql-test/r/system_mysql_db.result | |
| parent | 68768185734824a9dffeea5656f2fb5280d1f3a1 (diff) | |
| download | mariadb-git-c07f07c3e678f5f99bfd8ccf5c77cd4117758118.tar.gz | |
a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
the behavior of enum changed to be consistent.
mysql-test/r/system_mysql_db.result:
a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
mysql-test/r/type_enum.result:
a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
mysql-test/r/type_ranges.result:
a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
sql/sql_insert.cc:
a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
Don't issue warnings for enum fields.
sql/sql_parse.cc:
a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
set NO_DEFAULT_VALUE_FLAG flag for enum fields as well.
Diffstat (limited to 'mysql-test/r/system_mysql_db.result')
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index f3f019e43ba..c6e6d92220e 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -116,7 +116,7 @@ func CREATE TABLE `func` ( `name` char(64) collate utf8_bin NOT NULL default '', `ret` tinyint(1) NOT NULL default '0', `dl` char(128) collate utf8_bin NOT NULL default '', - `type` enum('function','aggregate') character set utf8 NOT NULL default 'function', + `type` enum('function','aggregate') character set utf8 NOT NULL, PRIMARY KEY (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions' show create table tables_priv; @@ -163,7 +163,7 @@ Table Create Table proc CREATE TABLE `proc` ( `db` char(64) character set latin1 collate latin1_bin NOT NULL default '', `name` char(64) NOT NULL default '', - `type` enum('FUNCTION','PROCEDURE') NOT NULL default 'FUNCTION', + `type` enum('FUNCTION','PROCEDURE') NOT NULL, `specific_name` char(64) NOT NULL default '', `language` enum('SQL') NOT NULL default 'SQL', `sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL default 'CONTAINS_SQL', |