diff options
| author | unknown <ramil@mysql.com> | 2005-10-07 20:34:40 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-10-07 20:34:40 +0500 |
| commit | 30d81f00415f8af0ed83b80fd8a92b8a37219092 (patch) | |
| tree | 57e26f60eb601a2cd249f0aaf304f5d25b61c1bf | |
| parent | c533a6bf04a0e1ba9941d72a288649f3b90dc701 (diff) | |
| parent | d1e71faf61348f291b36dc40848900a7090ba90b (diff) | |
| download | mariadb-git-30d81f00415f8af0ed83b80fd8a92b8a37219092.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-4.1-release
into mysql.com:/usr/home/ram/work/mysql-4.1
scripts/make_binary_distribution.sh:
Auto merged
| -rw-r--r-- | mysql-test/r/subselect2.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/subselect2.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/subselect2.result b/mysql-test/r/subselect2.result index 148c670c589..8fcfa06a8ae 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 diff --git a/mysql-test/t/subselect2.test b/mysql-test/t/subselect2.test index 839e94206d0..b21eda176b6 100644 --- a/mysql-test/t/subselect2.test +++ b/mysql-test/t/subselect2.test @@ -25,6 +25,8 @@ DOCID VARCHAR(32)BINARY NOT NULL ) ENGINE=InnoDB ; +INSERT INTO t1 (DOCID) VALUES ("1"), ("2"); + CREATE TABLE t2 ( DOCID VARCHAR(32)BINARY NOT NULL |