diff options
| author | unknown <ramil@mysql.com> | 2005-05-18 12:41:36 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-05-18 12:41:36 +0500 |
| commit | c0dca5f45b332dc7512405fa5a2387ef48feafe1 (patch) | |
| tree | 0eaaa55aea0343aedbcd126046e5a1185f95394b /mysql-test/r/system_mysql_db.result | |
| parent | ef342b743e4d8bb504590245e57f7ae45dc7808d (diff) | |
| parent | c07f07c3e678f5f99bfd8ccf5c77cd4117758118 (diff) | |
| download | mariadb-git-c0dca5f45b332dc7512405fa5a2387ef48feafe1.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0.b6267
mysql-test/r/system_mysql_db.result:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 159e9d15f29..07491187cbb 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; @@ -164,7 +164,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', |