diff options
| author | unknown <lars@mysql.com> | 2005-10-10 17:50:19 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-10-10 17:50:19 +0200 |
| commit | 37c98812b33595d404308cbd0e86e89b80f3631e (patch) | |
| tree | fd4a87cd1abf7aaf02b3656de8317b4dd4d9453e /mysql-test/r/subselect2.result | |
| parent | 931771422fc713dea035aff0993c6223b53e7a55 (diff) | |
| parent | 5d2bc92523991e4304d4cbad8b4759023f6213d8 (diff) | |
| download | mariadb-git-37c98812b33595d404308cbd0e86e89b80f3631e.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into mysql.com:/users/lthalmann/bk/mysql-5.0
myisam/mi_rkey.c:
Auto merged
mysql-test/r/subselect2.result:
Auto merged
mysql-test/t/select.test:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
configure.in:
After merge fixes
myisam/mi_search.c:
After merge fixes
mysql-test/r/select.result:
After merge fixes
sql/item.cc:
After merge fixes
sql/sql_parse.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
Diffstat (limited to 'mysql-test/r/subselect2.result')
| -rw-r--r-- | mysql-test/r/subselect2.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/subselect2.result b/mysql-test/r/subselect2.result index bc902ea7b0f..19047725528 100644 --- a/mysql-test/r/subselect2.result +++ b/mysql-test/r/subselect2.result @@ -14,6 +14,7 @@ DOCID VARCHAR(32)BINARY NOT NULL , PRIMARY KEY ( DOCID ) ) ENGINE=InnoDB ; +INSERT INTO t1 (DOCID) VALUES ("1"), ("2"); CREATE TABLE t2 ( DOCID VARCHAR(32)BINARY NOT NULL |