diff options
| author | unknown <mskold/marty@linux.site> | 2006-09-14 09:29:20 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-09-14 09:29:20 +0200 |
| commit | 583655674ba1b741df257dc9faa6e3b07aa363c3 (patch) | |
| tree | d0659ffdadb0c22768ae9387ede4299d6453ff5c /mysql-test/r/ndb_dd_basic.result | |
| parent | c7f93b417054ed747b1e6ae97261a50019175fba (diff) | |
| parent | 338d325ac62bda98f5c97568076e9454e2ab894d (diff) | |
| download | mariadb-git-583655674ba1b741df257dc9faa6e3b07aa363c3.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/r/ndb_dd_basic.result:
Auto merged
mysql-test/r/ndb_dd_disk2memory.result:
Auto merged
BitKeeper/deleted/.del-ndb_dd_advance.result:
Auto merged
BitKeeper/deleted/.del-ndb_dd_advance2.result:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_dd_basic.result')
| -rw-r--r-- | mysql-test/r/ndb_dd_basic.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_dd_basic.result b/mysql-test/r/ndb_dd_basic.result index c0d52a2b3fc..83cb12ce964 100644 --- a/mysql-test/r/ndb_dd_basic.result +++ b/mysql-test/r/ndb_dd_basic.result @@ -49,7 +49,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, `c` int(11) NOT NULL, PRIMARY KEY (`pk1`) -) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 +) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 INSERT INTO t1 VALUES (0, 0, 0); SELECT * FROM t1; pk1 b c |