diff options
| author | unknown <evgen@sunlight.local> | 2006-08-01 08:49:43 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-08-01 08:49:43 +0400 |
| commit | 2446666b7b83b06a3a87d2abc3de331d38cf2a0a (patch) | |
| tree | eeb2172ddd6157546519fe050e8e952ab7b89c90 /mysql-test/r | |
| parent | 74855936f391ce21af614f89c7dfd73e8eee0982 (diff) | |
| download | mariadb-git-2446666b7b83b06a3a87d2abc3de331d38cf2a0a.tar.gz | |
After merge fix
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/information_schema.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/rpl_insert_id.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/union.result | 14 |
4 files changed, 23 insertions, 8 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 32ef2000cf2..9e6a3f298c1 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -1238,7 +1238,14 @@ COLLATIONS COLLATION_NAME COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME COLUMNS TABLE_SCHEMA COLUMN_PRIVILEGES TABLE_SCHEMA +ENGINES ENGINE +EVENTS EVENT_SCHEMA +FILES TABLE_SCHEMA KEY_COLUMN_USAGE CONSTRAINT_SCHEMA +PARTITIONS TABLE_SCHEMA +PLUGINS PLUGIN_NAME +PROCESSLIST ID +REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA ROUTINES ROUTINE_SCHEMA SCHEMATA SCHEMA_NAME SCHEMA_PRIVILEGES TABLE_SCHEMA @@ -1269,7 +1276,14 @@ COLLATIONS COLLATION_NAME COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME COLUMNS TABLE_SCHEMA COLUMN_PRIVILEGES TABLE_SCHEMA +ENGINES ENGINE +EVENTS EVENT_SCHEMA +FILES TABLE_SCHEMA KEY_COLUMN_USAGE CONSTRAINT_SCHEMA +PARTITIONS TABLE_SCHEMA +PLUGINS PLUGIN_NAME +PROCESSLIST ID +REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA ROUTINES ROUTINE_SCHEMA SCHEMATA SCHEMA_NAME SCHEMA_PRIVILEGES TABLE_SCHEMA diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index 6252d8b8292..3c33fe1be2b 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -73,6 +73,7 @@ CREATE TABLE t1 ( a INT UNIQUE ); SET FOREIGN_KEY_CHECKS=0; INSERT INTO t1 VALUES (1),(1); Got one of the listed errors +drop table t1; create table t1(a int auto_increment, key(a)); create table t2(a int); insert into t1 (a) values (null); diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 4ea73009d35..72f2cd9a3d0 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -3475,7 +3475,7 @@ SELECT 0.9888889889 * 1.011111411911; 0.9998769417899202067879 prepare stmt from 'select 1 as " a "'; Warnings: -Warning 1466 Leading spaces are removed from name ' a ' +Warning 1546 Leading spaces are removed from name ' a ' execute stmt; a 1 diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index f1eff937e1a..1c53f45b698 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1311,14 +1311,14 @@ create table t2 as select *, f6 as f8 from t1 union select *, f7 from t1; show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `f1` char(1) default NULL, - `f2` char(5) default NULL, - `f3` binary(1) default NULL, - `f4` binary(5) default NULL, - `f5` timestamp NOT NULL default '0000-00-00 00:00:00', - `f6` varchar(1) character set utf8 default NULL, + `f1` char(1) DEFAULT NULL, + `f2` char(5) DEFAULT NULL, + `f3` binary(1) DEFAULT NULL, + `f4` binary(5) DEFAULT NULL, + `f5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `f6` varchar(1) CHARACTER SET utf8 DEFAULT NULL, `f7` text, - `f8` text character set utf8 + `f8` text CHARACTER SET utf8 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1, t2; (select avg(1)) union (select avg(1)) union (select avg(1)) union |