diff options
| author | kostja@bodhi.local <> | 2006-08-12 21:06:51 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-08-12 21:06:51 +0400 |
| commit | 04c97488f91c3db48be384c2ed14082dc6d6616b (patch) | |
| tree | cccb1fdd583e353f4a229cbb0f9d585104db78f9 /mysql-test/r/join_outer.result | |
| parent | b341356abdfa869c71d42709a13c2192603fab1c (diff) | |
| parent | 6691c623100134d666b142f5752fcc022bdd1ac9 (diff) | |
| download | mariadb-git-04c97488f91c3db48be384c2ed14082dc6d6616b.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'mysql-test/r/join_outer.result')
| -rw-r--r-- | mysql-test/r/join_outer.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index b199ec5b2fb..aca47a675d4 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -598,6 +598,8 @@ id int(11) DEFAULT '0' NOT NULL, name tinytext DEFAULT '' NOT NULL, UNIQUE id (id) ); +Warnings: +Warning 1101 BLOB/TEXT column 'name' can't have a default value INSERT INTO t1 VALUES (1,'yes'),(2,'no'); CREATE TABLE t2 ( id int(11) DEFAULT '0' NOT NULL, |