mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1

Browse source 
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
This commit is contained in:
unknown 2005-10-10 17:50:19 +02:00
commit 37c98812b3
12 changed files with 200 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/subselect2.result
View file

@ -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